Added integration testing

But not very sure if that's how it is supposed to be. I haven't complete
the integration testing
Merge branch 'master' of https://github.com/cs2103aug2014-w09-1j/main