minor changes
pull and merge for Jack's updated server
lots of stuff on server for photos and locations.
logic to load photos into rows in table view
can upload photos to server by selecting to gallery. WOOHOOO
working on getting photo gallery to work
awww hell yeah
it works. there is a photo gallery and upload process
start thumbnail creation
save small, medium, and large versions of uploaded photo in server.
Merge branch 'master' of https://github.com/jackrr/photo-place into photos

Conflicts:
	App/Resources/alloy/controllers/index.js
	App/app/controllers/index.js
	App/app/views/index.xml
Merge pull request #2 from jackrr/photos

Photos
removed node_modules folder and updated .gitignore
merged master into user-authentication branch. fixed bugs