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
user map is up
merge conflicts resolved
Merge pull request #63 from kaplali/user-map

User map