Changed Stuff
Merge branch 'master' of https://github.com/weeksling/SortaFine

Conflicts:
	I_node.c