Fixed progress for generated puzzle.
Added Timer
Merge branch 'hotkeys' into GUI
Merge branch 'GUI' into hotkeys
Re add hotkeys
fixed bugs
Added keyboard controls. Cleaned up menu options.
fixed merge
Set file extensions to default to txt.
Sorta fixed notes.
Finished labels.
Merge branch 'blarg' into GUI

Conflicts:
	sudoku-qt/Controller/MainController.cpp
	sudoku-qt/Controller/MainController.h
	sudoku-qt/Model/Model.pri
	sudoku-qt/sudoku-qt.pro