package added
Merge branch 'master' of https://github.com/cs2103aug2014-w13-2j/main

Conflicts:
	bin/main/Dynamiz.class
	bin/main/FileHandler.class
	bin/main/FileHandlerTest.class