First commit
Merge branch 'master' of github.com:lhunker/cs3013-proj1