Tweet model population
images controller added
images spec test
fixed conflicts
image controller spec tests
user and location controller development
index tests on controllers
cleaned up location user helpers
added home controller spec
added BCrypt gem
 basic layouts added, part-completed instagram.js
changes completed
fixed conflicts
geocode working, markers adding to map
all done
instagram appended, map working, recenter working
 insta tick, map tick, recenter tick