still working on styles
working on more styling
merge conflict stuff
resolving more merge conflicts
resolving merge conflicts w version.coffee, version.map
added geocoder, gmaps4rails gems to gemfile