Photo stuff
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Merge pull request #208 from jcadek/master

Added a couple more TextViews
Merge pull request #209 from jcadek/master

Resolved Warning for hard-coded text
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	gen/ca/ualberta/CMPUT301F13T02/chooseyouradventure/R.java
	res/layout/view_stories_activity.xml
Added  sekbars