Camera aðferpir
Merge branch 'master' of https://github.com/halldorel/hv2
Merge branch 'master' of https://github.com/halldorel/hv2

Conflicts:
	deck.py