DummiCommit
Merge branch 'master' of https://github.com/stefanobettinelli/anno_domini

Conflicts:
	server/server.py
Merge branch 'master' of https://github.com/stefanobettinelli/anno_domini