compiled assets
Merge branch 'master' of https://github.com/juliaoh/fruitfulminds

Conflicts:
	coverage/.last_run.json
	coverage/.resultset.json
	coverage/index.html
	db/development.sqlite3
	log/development.log
	log/test.log