i hope this fixes it
Merge branch 'master' of https://github.com/i2c2-caj/code-camp-2013

Conflicts:
	main.py
	scanner.py