ignore extras/png.py
Merge remote-tracking branch 'pokecrystal/master'
switch to pokecrystal-demo in .gitignore