update server
Merge branch 'master' of github.com:SJAnderson/illinois

Conflicts:
	.gitignore
update server