Heroku assets...
Merge branch 'master' of github.com:crabstic/Linnaeus

Conflicts:
	Gemfile