Avoidance
Merge branch 'master' of https://github.com/herbfunk/Funky

Conflicts:
	FunkyTrinity/Plugin.cs