phase 1 complete
Merge branch 'master' of https://github.com/kryzodoze/340-project
phase 1 complete