Test changes
Merge branch 'master' of https://github.com/williamgross/337AwardShow

Conflicts:
	awardshow.py
	feelings.py
test changes - delete soon