hi
Merge branch 'master' of https://github.com/kathleenlogmao/Lasvea.git

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/style.css.scss
hi lasvea