Created the Jock class and fixed a few issues.
Implemented the effects of equipment on the Hero's stats.
Merge branch 'dev' of https://github.com/huntmiester/GeoBattles into dev

Conflicts:
	GeoBattle/src/com/vtgp/geobattle/Nerd.java