Ready for combat
Merge branch 'develop' of https://github.com/CepGamer/Suffle into develop

Conflicts:
	SuffleIDE/Controller/Controller.fsproj
	SuffleIDE/Controller/file.suf
Minor fix