Everything I have for the video files. This won't work for saving or caching videos
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into AVBranch

Conflicts:
	AndroidManifest.xml
	gen/ca/ualberta/CMPUT301F13T02/chooseyouradventure/R.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewPageActivity.java
Everything I have for the video files. This won't work for saving or caching videos
Merge branch 'AVBranch' of https://github.com/moorej12/301project into AVBranch

Conflicts:
	AndroidManifest.xml
	gen/ca/ualberta/CMPUT301F13T02/chooseyouradventure/R.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewPageActivity.java
Merge pull request #224 from moorej12/AVBranch

Everything I have for Audio and Video so far