merge
Merge branch 'master' of https://github.com/cs2103aug2014-t11-2j/main

Conflicts:
	bin/junit/SparkMoVareTest.class