DAMN I COMMITED IT
Merge branch 'master' of https://github.com/mistabrando/bruinlyfe

Conflicts:
	cafe1919.py
1919 unicode problem fixed