testing out something
Merge branch 'master' of github.com:daguy666/killingtime
Testing