Minor mod for pulling later
Merge branch 'master' of https://github.com/cs2103aug2014-t11-2j/main

Also finished adding the rest of the various types of user inputs
Merge branch 'master' of https://github.com/cs2103aug2014-t11-2j/main

Conflicts:
	bin/.gitignore