Merge pull request #42 from jjlee5266/css

Css
styling
Merge pull request #44 from jjlee5266/styling

styling
Merge branch 'master' of github.com:jjlee5266/Where-Fi into css

Conflicts:
	app/assets/stylesheets/application.css