backgroundimage
Merge branch 'master' of https://github.com/rshandy/hex

Conflicts:
	images/background.png