added headers and some pep 8 format
Merge branch 'master' of https://github.com/erinspace/CalPoly

Conflicts:
	consumer.py
add more formatting