Added SelectPhoto() method to CameraAndPhoto()

Starts activity to select a photo from the gallery.
Added .settings to gitignore
Commented all model and controller classes
Merge branch 'master' of https://github.com/Wyattjoh/TaggingApp
Merge branch 'master' into PictureListRefactor

Conflicts:
	src/ca/ualberta/cs/taggingapp/models/Picture.java