added deck data
Merge branch 'master' of https://github.com/cgibson/space-elves

Conflicts:
	controllers/resource.py
	global_mod.py
Merge branch 'master' of https://github.com/cgibson/space-elves