started coding ViewPagesActivity.java
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Merge pull request #58 from tbendubois/master

New PDF with updated terms. Main menu XML
Merging James Cadek's pull request
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	UIMockup/Storyboard/Storyboard.pdf
	UIMockup/TDubois Storyboard using JCadek UIMockup.pdf
	UIMockup/TDuboisJCadek_Storyboard.pdf
	res/values/strings.xml