Revert 95ebf2d..fb9f632

This rolls back to commit 95ebf2dbe0f3ea6bbafbc9a7ae2206c960193970.
Revert "Merge branch 'master' of https://github.com/cs2103aug2014-w15-2j/main"

Conflicts:
	src/test/UserTest.java
remove mystery numbers and string