Merge static files with awesome stuff
Merge branch 'master' of https://github.com/Cosmo/till-i-collapse

Conflicts:
	Rails/app/assets/stylesheets/application.css.sass