resolve classpath conflict
Merge branch 'master' of github.com:cs2103aug2014-t17-1j/main