Refactoring
Merge branch 'master' of
https://github.com/CMPUT301F13T11/Team11AdventureBook.git

Conflicts:
	AdventureBook/src/c301/AdventureBook/TakePhotoActivity.java