Much changed
Merge branch 'master' of https://github.com/thedarkduscher/UfoBuilder

Conflicts:
	UFO Builder/UFO Builder.vcxproj

Much changed (broken)