changed test 2
Merge branch 'master' of https://github.com/rmstanton/Cockpit

Conflicts:
	test2.txt
Merge branch 'master' of https://github.com/rmstanton/Cockpit