trying to improve maps displays
resolving conflicts
removed else statement from javascript
removed whitespace
Merge pull request #37 from kaplanoah/master

Changed ActiveRecord query from id to user_id to avoid ambiguous column