Ignore public assets
Revert "gitignore file from github."

This reverts commit a38099f6942288109bd46ace762319cf23465cd3.
Fixing screwups
Precompile
Merge branch 'master' of heroku.com:hymnal-wsf

Conflicts:
	.gitignore
Remove CKEditor GEM