uml diagram created
Merge pull request #53 from moorej12/master

uml diagram created
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into 50-ESHandler

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Page.java