Merge branch 'shaun'
Merge pull request #9 from jannah/DIRK

Progress Bar
DB loggin works
DB Logging done
Merge remote-tracking branch 'origin/DIRK'

Conflicts:
	_js/display-operations.js
	index.html
Word Highlighting working
Speed fixed
Merge branch 'master' into DIRK