End Test
slave_test
Merge branch 'slave' of github.com:billlee77/computer into slave

Conflicts:
	slave_1
	slave_2