fixed merge crap in Comment.java
Added Handler exceptions
Merge pull request #68 from klindenbach/50-ESHandler

Added Handler exceptions, looks good
Story Creation + Several Small tweaks
Made Page parcelable
Merge pull request #69 from jcadek/master

Creating stories and other tweaks.
Fleshing out code, new UIMockup
Merge pull request #72 from jcadek/master

Fleshing out code, new UIMockup
 #73 added a get all stories method to ES Handler.
Merge pull request #74 from klindenbach/73-getAllStories

 #73 added a get all stories method to ES Handler.
So this is the new PDF. I didn't know if clicking on the story from the main menu automatically loads it. If it does, delete slide 9
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Put the proper PDF in, shoudl be the last version needed
Merge pull request #75 from tbendubois/master

Added final version (hopefully) of the PDF with new options
final term change, hopefully
Merge pull request #77 from tbendubois/master

final term change, hopefully
fingers crossed
Merge pull request #78 from tbendubois/master

fingers crossed
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into 70-license-headers

Conflicts:
	gen/ca/ualberta/CMPUT301F13T02/chooseyouradventure/R.java