Change alot of shit
Merge branch 'master' of
https://github.com/CMPUT301F13T11/Team11AdventureBook.git

Conflicts:
	AdventureBook/src/ca/ualberta/c301/adventurebook/ViewPageActivity.java