Changed Employee's method extract_hours to static
Added rawmark to facilitate comparisons in Mark
Merge remote-tracking branch 'origin/master'

Conflicts:
	Mark.py
Added rawmark to facilitate comparisons in Mark