Newest changes
Merge remote-tracking branch 'origin/omar'

Conflicts:
	helpers.py
	helpers.pyc
Trying to merge with master.
Fixing merge conflicts.