Initial commit, everything works, but some bugs
Merge https://github.com/ebbruns/Assignment4
merging is fun