fix<.classpath>: fix classpath and add variables to the classpath
Merge branch 'master' of https://github.com/cs2103aug2014-t15-4j/main.git
Merge branch 'master' of https://github.com/cs2103aug2014-t15-4j/main.git
fix<.classpath>: add new Jar file
<Magic8UI>: Undone
Merge branch 'master' into GUI

Conflicts:
	Magic8/src/fantasticfour/magiceight/Magic8UI.java
Magic8UI undone
Merge branch 'master' of https://github.com/cs2103aug2014-t15-4j/main.git
Merge branch 'master' into GUI
<Magic8UI>: Undone
Merge branch 'master' of https://github.com/cs2103aug2014-t15-4j/main.git
Merge branch 'master' into GUI
feat<Magic8UI>: Add GUI
fix(DisplayCommand): fix tag display
fix(Magic8Parser): fix parseException in the DateTime when reopening the
file
Merge branch 'master' of https://github.com/cs2103aug2014-t15-4j/main.git
Merge branch 'master' into GUI