Initial commit
Merge branch 'master' of https://github.com/rachlbrown/cs4414-project