if statement back
Merge remote-tracking branch 'origin/master'

Conflicts:
	rushhour/rushhour.py