Initial commit
Merge branch 'master' of github.com:matthewbadeau/matthewbadeau
Fixing some stuff I broke