merged
Merge branch 'master' of github.com:jgerbasi/237-term-project
removed stupid shit