initial implementation of timeout function. want to test server crash
behavior before continuing
Merge branch 'master' of git@github.com:pmanko2/512_project.git

Conflicts:
	src/ResInterface/ResourceManager.java