fixed indentation and added ? in maps.js
added first 15 words of post to info box with link to marker page
added styling to text in infowindow
removed photos table, photo model, and all photo elements; added photo column to markers table, and photo upload functionality throughout the app
working on ajax marker photo upload
completed ajax photo upload on trip/marker creation
merged photo_marker onto master
fixed conflict
removed photos from abilty file
added tweeting functionality to trips show page
merged master onto ajax_trip