Assets forced
Merge branch 'master' into heroku
Rescue
Assets, heroku
Assets, heroku
heorku
Merge branch 'master' into heroku

Conflicts:
	log/development.log
Heroku Push
Assets
Merge branch 'master' into heroku
assets
assets
Litle view change- buton 'how to'
A little fuss
Merge branch 'creature_tree' into heroku

Conflicts:
	public/assets/manifest-848ada0a9a395480a91d0f2ae069b305.json
Fix gon problem
assets
Fixed