Merge branch 'master' of https://github.com/TheAtomicGnome/Fimbul

Conflicts:
	Fimbul/Fimbul.sdf
	Fimbul/Fimbul.v11.suo