Version: 1.1.3.date_alpha
Merge branch 'master' of https://github.com/Juncai/cs5200project
Version: 1.1.4.data_alpha
Merge branch 'master' of https://github.com/Juncai/cs5200project

Conflicts:
	try/WebRoot/WEB-INF/classes/neu/edu/JJ.class