commit stra vecchia
Merge branch 'master' of https://github.com/m4ff/simple-forum

Conflicts:
	relations.sql