getting ready for the mother of all merges
unstable merge state
Merge branch 'master' of github.com:MadcowD/PyAscii