commit my irrelevant file but not the .idea
commit stuff
commit james' stuff
partially updated jquery modal form add photo
Merge branch 'master' of https://github.com/sp0ngey/travelapp1
trip item modal form ajax

more updates...