Merge conflict file
Merge branch 'master' of
https://github.com/evilband7/tagcommunicationsystem.git

Conflicts:
	src/system/controller/TestController.java