Finished acceptance testing
Merge branch 'master' of github.com:TeamW/Deliverable-7