comit
Merge branch 'master' of https://github.com/CMPUT301F13T14/Team14StoryBuilder.git
Merge branch 'master' of
https://github.com/CMPUT301F13T14/Team14StoryBuilder.git

Conflicts:
	Cryosa/src/ca/ualberta/cs/cmput301/cryosa/StoryPreviewActivity.java
Merge branch 'master' of https://github.com/CMPUT301F13T14/Team14StoryBuilder.git
modified intents
Merge branch 'master' of https://github.com/CMPUT301F13T14/Team14StoryBuilder.git