Commiting one with merge conflict
Merge branch 'master' of https://github.com/nick-smith8/CSCI3308
THE FINAL COMMIT