design
test
Merge branch 'master' of https://github.com/Sophen/suedor

Conflicts:
	app/assets/stylesheets/application.css
fix design