Some additions to .gitignore and typo in activites_controller photo_origin/photo_original
Merge branch 'master' of https://github.com/Eclipse932/SyncUp_backend

Conflicts:
	app/controllers/activities_controller.rb
Added .pyc to gitignore