updating stuff
Merge branch 'master' of github.com:JGrubb/shockenaw