updates to code, cleaned it up like whoa
Merge branch 'master' of https://github.com/matthops/portfolio