first sounds
Merge branch 'master' of https://github.com/Mathgoat/square-loot.git

Conflicts:
	options.txt