modified:   src/ualberta/g12/adventurecreator/EditFragmentActivity.java
	modified:   src/ualberta/g12/adventurecreator/MainActivity.java
Merge branch 'ObjectAndControllerClasses' of https://github.com/Team-CMPUT301F13T12/301-Project into ObjectAndControllerClasses
Merge branch 'ObjectAndControllerClasses' of https://github.com/Team-CMPUT301F13T12/301-Project into ObjectAndControllerClasses
camera working