passing currentUser to maps page
Merge branch 'master' of github.com:vmathur/mhacks3
fixed conflicts
Merge branch 'master' of github.com:vmathur/mhacks3