tiles and player background added
Merge remote-tracking branch 'origin/master'

Conflicts:
	styles/images/Thumbs.db