Merge branch 'master' into JoshWork
Testing InfoActivity
Added button to InfoActivity
Debuggin
Editing layout
Editing layout for InfoActivity
Finished tinkering with layout
Working on a getHelp method to launch InfoActivity

passing help text through intents
Implemented a help guide on ViewBrowseStories

Its kinda ugly though lol
Merge branch 'JoshWork'

Conflicts:
	AndroidManifest.xml
fixing merge conflict
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard

Conflicts:
	AndroidManifest.xml
fixing merge conflict