Trying to fix conflicts
Merge branch 'master' of https://github.com/julianbutsa/CS3773.git
made some cases.
made skeleton function.