First commit
Updated stuff

Merge github.com:videoman/T-ShirtCannon