push
Merge branch 'master' of https://github.com/pavelkang/mhacks

Conflicts:
	mhacks.py