Merge branch 'comments'
Merge branch 'master' of github.com:jjlee5266/Where-Fi
Merge branch 'master' of github.com:jjlee5266/Where-Fi
Added CSS
Including:
Pure Forms,
Colors,
Location Show Page
Comment Form
Merge branch 'master' of github.com:jjlee5266/Where-Fi into css

Conflicts:
	app/assets/stylesheets/application.css
	app/assets/stylesheets/buttons-core-min.css
	app/assets/stylesheets/buttons-core.css
	app/assets/stylesheets/buttons-min.css
	app/assets/stylesheets/buttons.css
	app/assets/stylesheets/forms-min.css
	app/assets/stylesheets/forms-nr-min.css
	app/assets/stylesheets/forms-nr.css
	app/assets/stylesheets/forms.css
	app/models/location.rb
	vendor/assets/stylesheets/normalize.css
Merge pull request #42 from jjlee5266/css

Css