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

Conflicts:
	app/views/pages/contact.html.erb
Merge branch 'master' of https://github.com/kathleenlogmao/Lasvea.git
hi