changed 1 to A
changed trash functions
Merge branch 'master' of http://github.com/halldorel/hv2 into wip-helga

Conflicts:
	deck.py