finishing touches
Merge https://github.com/morganpatz/proj1