various shitmixes
Merge branch 'master' of http://github.com/halldorel/hv2

Conflicts:
	deck.py