health
Merge branch 'master' of https://github.com/timekillerg/files

Conflicts:
	Space Madness/Library/CurrentLayout.dwlt
	Space Madness/Library/assetDatabase3
	Space Madness/Library/expandedItems