-GUI added the conversion function from textfile to table from
Merge branch 'master' of https://github.com/cs2103aug2014-t11-2j/main

Conflicts:
	bin/gui/MainController$1.class
	bin/gui/MainController$2.class
	bin/gui/MainController$3.class
	bin/gui/MainController$4.class
	bin/gui/MainController$5.class
	bin/gui/MainController$6.class
	bin/gui/MainController$7.class
	bin/gui/MainController$8.class
	bin/gui/MainController$9.class
	bin/gui/MainController$UpdateTimerTask$1.class
	bin/gui/MainController$UpdateTimerTask.class
	bin/gui/MainController.class
	bin/gui/commandHistory.class
	bin/gui/imageGetter.class