Initial commit
Testing commit
Lilly commit
Michael's test commit
Tim's First Commit
Merge branch 'master' of github.com:SeaLions/csc324_dev_proj
brendan's commit
Merge branch 'master' of github.com:Sealions/csc324_dev_proj
Aaron's First Commit
Jame's commit
Tristan's first commit
Merge branch 'master' of github.com:SeaLions/csc324_dev_proj
Second Commit
Merge branch 'master' of github.com:SeaLions/csc324_dev_proj
Merge branch 'master' of github.com:SeaLions/csc324_dev_proj
Merge branch 'master' of github.com:SeaLions/csc324_dev_proj
testing git commit author message
recovered brendan's swp file to normal file
Committing to test log/tracking thing
testing commit author holds from another computer