prep for init
Merge branch 'master' of https://github.com/zackargyle/senior-project