Merge branch 'master' of https://github.com/dreamania/ukulele_academy

Conflicts:
	app/assets/stylesheets/application.css
Merge branch 'master' of https://github.com/dreamania/ukulele_academy

Conflicts:
	app/assets/stylesheets/application.css