Started implementing taking video (Doesn't show...sounds familiar),
changed picture in default fragment (He so sad)
Merge branch 'master' of
https://github.com/CMPUT301F13T14/Team14StoryBuilder.git

Conflicts:
	Cryosa/src/ca/ualberta/cs/cmput301/cryosa/EditFragmentActivity.java
Fixed merge errors (silly merge tool)
Merge branch 'master' of https://github.com/CMPUT301F13T14/Team14StoryBuilder.git