background
Merge branch 'master' of https://github.com/psg93/demo
tutu
Merge branch 'master' of https://github.com/psg93/demo

Conflicts:
	app/assets/stylesheets/application.css
scaffold
menus
menus