Styles and sounds working
Merge branch 'borderwork' into gh-pages

Conflicts:
	img/Thumbs.db