akhe chera?
Merge branch 'master' of github.com:SharifAnonymousGroup/WhoAmI

Conflicts:
	Game/views/election.py
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
time_handling in django
Merge remote-tracking branch 'origin/master'

Conflicts:
	Game/views/chat.py
	static/WhoAmI/scss/game_page.css
time_handling in django