Created DisplayControllerTest
Merge branch 'master' of https://github.com/solfuglen/glare.git

Conflicts:
	src/bll/DisplayController.java
Merge error