More css features
Merge branch 'css' of github.com:jjlee5266/Where-Fi into css

Conflicts:
	app/assets/stylesheets/application.css