Finished reporting
Merge branch 'master' of https://github.com/nsaxton/Proj1.git