more changes
Merge branch 'master' of github.com:jaredphillips/pauls-project