Merge branches 'jamesPull' and 'master'
ntermediate thing
Merge https://github.com/jcadek/301project into jamesPull
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Buggy stuff
Working on Authoring
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
Working on bugs
Fixed Bugs and Saving
#116 Added DBHandler implementation. Was not able to run tests at all because my eclipse implementation was not able to launch the APK - Will run tests on a lab computer
Major MVC refactoring
Massive MVC update
Merge pull request #124 from tbendubois/#116_DuplicateESHandlerFunctionalityInDBHandler

#116 Added DBHandler implementation.
Merge pull request #123 from jcadek/master

#113 #114 #115 #118 Massive MVC Refactoring,  Fixed Saving and Bugs
Added Tile Menu, implemented photo duality
JavaDoc
Merge pull request #125 from jcadek/master

Added Tile Menu, implemented photo duality
#114 Made ViewPageActivity MVC
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into makeMVC

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ControllerApp.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Page.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/TextTile.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewPageActivity.java
Merge pull request #126 from moorej12/master

#114 Made ViewPageActivity MVC