3 commits

Author	SHA1	Message	Date
Zach Brown	ed6bd4ea4a	Update upstream B/CB - hitEntity added upstream	2016-11-28 17:16:07 -06:00
Zach Brown	8c27c1fd27	Alter last to force conflicts but keep contents	2016-11-26 22:02:19 -06:00
Alfie Cleveland	324acd64b4	Optimise NetworkManager	2016-11-26 21:48:09 -06:00