Added Basic multithreading for enemy acquiring
Fixed conflicts
BattleScreen now has access to controller
Merge branch 'dev' of https://github.com/huntmiester/GeoBattles into dev

Conflicts:
	GeoBattle/src/com/vtgp/geobattle/Nerd.java
Created the EquipmentFactory class and some equipment.
Fixed a few issues, like the missing delivery stat initialization.