Change storage location to user home directory
Merge branch 'master' of https://github.com/cs2103aug2014-f10-1j/main

Conflicts:
	src/stream/Stream.java
Merge branch 'master' of https://github.com/cs2103aug2014-f10-1j/main

Conflicts:
	src/stream/Stream.java