styling
Merge branch 'master' of https://github.com/BU-ZY/buzy

Conflicts:
	app/assets/stylesheets/custom.css.scss
Merge branch 'master' of https://github.com/BU-ZY/buzy
change color scheme
small changes
Merge pull request #4 from BU-ZY/styling

Styling