Oh god I forgot to merge earlier.
Merge branch 'master' into sound_engine

Conflicts:
	libs/fsm.lua
	main.lua
Merge pull request #16 from variousauthors/sound_engine

Sound engine