Need to commit to pull. no real changes
Merge branch 'master' of https://github.com/nh295/CSER_2015

Conflicts:
	java/CSER2015.jar
Save funciton testing and working