more stuff
Merge branch 'master' of https://github.com/haxiomic/Hive

Conflicts:
	Hive/HiveWindow.m