#2 | George and Asif | Add test for happy path of FileUploadController. Change playerList2.txt and other tests to reflect new "contract" for valid files, and DOM change from id=player-list to id=player-table.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/com/springapp/mvc/unit/controller/FileUploadControllerTest.java
#2 | George and Asif | Merge changes from earlier tests on FileUploadController.
#2 | George and Asif | Create controller action and view for file upload error message.