gitignore
Updated server

Merge branch 'master' of github.com:srvanderplas/LieFactorSine

Conflicts:
	.gitignore