added link to show trip from trip_interface
fixed bug with master merge
fixed merged master conflict
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