W 0.26
Merge branch 'master' of https://github.com/cs2103aug2014-w15-1j/main
check
Merge branch 'master' of https://github.com/cs2103aug2014-w15-1j/main

Conflicts:
	bin/.gitignore
	src/cli/CliProcess.java
deleted my original j-unit testing