new merge stuff
Merge branch 'master' of https://github.com/mdfeist/CMPUT291Project1
Merge branch 'master' of https://github.com/mdfeist/CMPUT291Project1
Merge branch 'master' of https://github.com/mdfeist/CMPUT291Project1
finished query 4
Merge branch 'master' of https://github.com/mdfeist/CMPUT291Project1
added comments to all files