initial commit
Merge branch 'master' of github.com:graemefunk87/comp4870Assn1