Tyler Renelle e387ee9d13 Merge remote-tracking branch 'Shaners/patch-3' into contrib ...

Conflicts:
	views/options/pets.jade

2013-11-06 17:40:02 -08:00

..

index.jade

challenges: switch from ngRoute to ui-router

2013-10-28 11:34:08 -07:00

inventory.jade

Clarify pet hatching instructions

2013-10-31 09:34:43 -07:00

stable.jade

Merge remote-tracking branch 'Shaners/patch-3' into contrib

2013-11-06 17:40:02 -08:00