built a functional upgrade screen
Merge branch 'master' of https://github.com/cjgendron/dragons-lair

Conflicts:
	Assets/scripts/Dragon.cs