merging
Merge branch 'master' of https://github.com/ftrimble/CSCI-4320-Project
working on writeup
Merge branch 'master' of https://github.com/ftrimble/CSCI-4320-Project
did some code optimization