auto-upload
Merge branch 'master' of github.com:hawkfalcon/BukkitRepo