stuff-just ignore for now
Merge remote-tracking branch 'origin/master'

Conflicts:
	client_pygame/display/display.py
Merge branch 'master' of https://github.com/darthmars97/CodeCamp2014