Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
t message for your changes. Lines starting
82-Did the top half of java docs
Merge pull request #103 from jcadek/master

Updated features involving firstpage
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into tbendubois-82-topHalfOfjavadocs

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/EditStoryActivity.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Story.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventuretest/ESHandlerTest.java
Merge branch '82-topHalfOfjavadocs' of https://github.com/tbendubois/301project into tbendubois-82-topHalfOfjavadocs

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ControllerApp.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Decision.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/EditStoryActivity.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/PhotoTile.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Story.java
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Edited Display of Pages
Refactoring and tweaks
Renamed ControllerApps for consistency
Merge pull request #108 from jcadek/master

Edited How ListViews, Refactoring and Other Tweaks
Made ViewPageActivity look nice
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ControllerApp.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Page.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewPageActivity.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventuretest/TileGsonMarshalTest.java
Missed a conflict in last commit. Solved it.
Small changes to appearance and some code refactoring