Added some stuff
Merge branch 'dev' of https://github.com/kentsommer/4061-projects into dev