style
Merge branch 'master' of github.com:jjlee5266/Where-Fi

Conflicts:
	app/views/application/home.html.erb