Renamed tests as Tests.java and pushed. Updated error in Display.java
and pushed
Merge branch 'Storage_(WX)' of https://github.com/cs2103aug2014-w14-1j/main into daryl_storage

Conflicts:
	src/Display.java