first commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/main/java/com/gc/web/tableController.java
	src/main/webapp/WEB-INF/views/table.jsp