idk
argh
Merge branch 'master' of https://github.com/derekbraun/529

Conflicts:
	529.py