Merge branch 'master' of https://github.com/kaplali/parkstorm into integration-tests
crappy integration tests
merge fixes
Merge branch 'master' of https://github.com/kaplali/parkstorm into signup-login-forms
Merge branch 'master' of https://github.com/kaplali/parkstorm into signup-login-forms
working on user map
Merge branch 'master' of https://github.com/kaplali/parkstorm into user-map
added br tag on login form
Updated positioning of forgot password button
Merge branch 'master' into button_moving
Merge pull request #61 from kaplali/mobile

Mobile
user map is up
Merge branch 'master' into button_moving
merge conflicts resolved
Merge pull request #62 from kaplali/button_moving

Button moving
form works
Merge pull request #63 from kaplali/user-map

User map
Add region method for geojson
Merge branch 'master' of https://github.com/kaplali/parkstorm
zach rocks. seriously