added .DS_STORE to .gitignore for OS X
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
#50 ES handler for save/restore pages w/ tests
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into 50-ESHandler

Mostly changing Segment to Tile. Forgot about that... hope the UML
didn't get too messed up

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/AudioTile.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Comment.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Handler.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Page.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/PhotoTile.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Reader.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/VideoSegment.java
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
Merge pull request #52 from klindenbach/50-ESHandler

50 es handler
Commit
Fixed conflicst