Merge branch '82-JavaDoc' of https://github.com/klindenbach/301project into klindenbach-82-JavaDoc

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
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
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
Working on Authoring
#83 all unit tests for model now pass
Unit Tests
#111 Deleted page handler methods -- they were causing confusion
#82 More JavaDocing
Merge pull request #119 from klindenbach/83-JUnit-model

#83 all unit tests for model now pass
Merge pull request #121 from klindenbach/82-JavaDocing

#82 More JavaDocing
Merge pull request #120 from klindenbach/111-Delete-page-handler-methods

#111 Deleted page handler methods -- they were causing confusion
Added Junit testing project, and changed ControllerApp
Merge branch 'unitTestBranch' of https://github.com/KarlParkinson/301project into unitTestBranch
Merge branch 'unitTestBranch' of https://github.com/KarlParkinson/301project into 83-JUnit-model
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
#83 changed all JUnit tests to run in new AndroidTest project