Ela mana moy
Merge branch 'test_branch'

Conflicts:
	gep_db/db.sqlite3
	gep_db/loz_lol/models.py

merging test_branch to master