Fix gradle version; allow choosing a main class from gradle run
Merge branch 'master' of https://github.com/SeanTater/uncc2014watsonsim

Conflicts:
	build.gradle