styling
Merge pull request #45 from jjlee5266/css

Css
Merge pull request #46 from jjlee5266/css

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

Conflicts:
	app/views/users/show.html.erb
styling
Merge pull request #47 from jjlee5266/css_styling

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

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