Merge Proto02.
Merge branch 'master' of
https://github.com/CMPUT301F13T07/Team07Story.git

Conflicts:
	AdventureStoryFinal/gen/edu/ualberta/adventstory/R.java
	AdventureStoryFinal/src/edu/ualberta/adventstory/PageViewActivity.java