getting tweets to work... rolen is the man
updating front end
pushed tweets/messages into the trip model
adding front end to form
merging changes
creating front end edits
trying to merge different commits
homepage and form
designing connect accounts page
reworked user controller so that it finds or creates users in database... accounts are working except mappingkat :(
added twitters to view
failing specs but login works
merging changes
Added error handling for view where instagram not added yet.  Limited photos to trip date range.
refixing merge conflicts
added method to user model to provide possessive name
stuff
fixed changes
Small spec edit
minor fixes to tests