refresh
Merge branch 'master' of https://github.com/fritze2/PinewoodPilot

Conflicts:
	core/__init__.pyc
	core/contestant.py
	core/contestant.pyc
	core/display.py
	core/display.pyc
	core/heat.py
	core/heat.pyc
	core/race.py
	core/race.pyc
	core/registrar.py
	core/registrar.pyc
	core/restore.py
	core/restore.pyc
	frame.py
	frame.pyc
	main.py
	methods/doubleelim.pyc
	methods/lanerotation.pyc
	restore.dat
	tabs/__init__.pyc
	tabs/fullscreen.py
	tabs/tabrace.py
	test/unittest_restore.py
	timers/__init__.pyc
	timers/fasttrack.py
	timers/fasttrack.pyc
	timers/manual.pyc
	timers/smartline.py
	timers/smartline.pyc
	update/__init__.pyc