Stupid changes
Merge branch 'master' of https://github.com/comtesacristain/nopims

Conflicts:
	zipup.py