trying to fix assets compilation
Merge branch 'master' of https://github.com/railsrumble/r13-team-532

Conflicts:
	config/application.rb