initial commit
Merge github.com:RobertMcDermot/CS1530Project