Merge branch 'master' of https://github.com/Guardy/guardy

Conflicts:
	db.sqlite3
Merge branch 'master' of https://github.com/Guardy/guardy