Controller package w/controllers added,ServerPoller modified
Merge branch 'master' of https://github.com/abe-austin/Catan

Conflicts:
	java/src/client/serverProxy/ServerPoller.java
fixing merge issue with serverPoller