Removed the old JSON library
Added final int to the Task classes
Merge branch 'master' of https://github.com/cs2103aug2014-w15-3J/Ticker

Conflicts:
	.classpath