Uncommented indentation. Fixed the TODO in a message
Merge branch 'master' of github.com:kls2510/UROPTestingSystem

Conflicts:
	src/main/resources/CheckstyleFormat.xml