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

Conflicts:
	Team08StoryApp/src/com/team08storyapp/StoryController.java
	Team08StoryAppTest/src/com/team08storyapp/test/testStoryController.java
formatting/commenting