Integration Test w/o negative Test completed
Merge branch 'master' of https://github.com/antezek/CS4218
Tidying up