Merge remote-tracking branch 'upstream/master'
renaming xsgen.py to main.py
Merge branch 'master' of github.com:jdangerx/xsgen