set up devise
update gem file
fixed syntax error in gemfile
installed pg
Merge pull request #1 from tjblonsk/master

added leaflet gem
working on bootstrap
aggravating git problems with merging
commit
Where did all my code go?!?!?!
deleting stuff
rebuilding views
work on clicks
resolved conflicts