merging
Merge branch 'master' of https://github.com/CMPUT301F13T08/CMPUT301F13T08

Conflicts:
	Team08StoryAppTest/src/com/team08storyapp/test/testStoryFragment.java
merging