fixed bug of storage
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Storage.java
deleted testing .txt
Merge remote-tracking branch 'origin/master' into khyean