Merge pull request #85 from fiery-skippers-2014/refactor

Refactor
styled popup content and experience
fixing grammar errors
Merge pull request #86 from fiery-skippers-2014/refactor

added placeholder text for edit profile form
Merge branch 'master' of https://github.com/fiery-skippers-2014/EPICSWAP into fixing_bugs
Merge pull request #87 from fiery-skippers-2014/fixing_bugs

fixing grammar errors
added meta tag to try to account for iPhone resize-zooming issue
merge conflict
Merge pull request #88 from fiery-skippers-2014/styling_and_ux_design

Styling and ux design, markers on map and trying to fix pinch resizing
omg viewport units buggyfill might solve the iPhone bug. pushing to heroku to test with this version
Merge pull request #89 from fiery-skippers-2014/styling_and_ux_design

nathan said i could merge it
galaxy s3 fix perhaps
Merge pull request #90 from fiery-skippers-2014/styling_and_ux_design

galaxy s3 fix perhaps
updated gitignore file to exclude dotenv AND perhaps fixed google chrome bug
Merge branch 'master' of https://github.com/fiery-skippers-2014/EPICSWAP into styling_and_ux_design
Merge pull request #91 from fiery-skippers-2014/styling_and_ux_design

Styling and ux design
styled user page
3 tests failing
Merge branch 'master' of https://github.com/fiery-skippers-2014/EPICSWAP into fixing_bugs
Merge pull request #92 from fiery-skippers-2014/styling_and_ux_design

Styling and ux design