UPDATE ANAMNESIS DONE
Merge branch 'master' of https://github.com/CannedHead/Cepytin

Conflicts:
	server.js