Some edit
Merge branch 'master' of https://github.com/drewdinger/CSCI3308_Lab3