Things seem good right about now
Merge branch 'master' of https://github.com/davidthibodeau/drunken-robot

Conflicts:
	clean/serversrc/resImpl/TMimpl.java