Added file headers, per class format
Merge branch 'master' of https://github.com/spaustia/cse331_project2