merge
 Merge branch 'master' of https://github.com/alexcazacu/stockfight
check_fights
 Merge branch 'master' of https://github.com/alexcazacu/stockfight

Conflicts:
	stockfight/db.sqlite3