Updated gitignore to include upload directory
Merge branch 'master' of github.com:JackRamey/LaserPony