Moved definition of keylogger
Merge branch 'origin/master'

Conflicts:
	rapport.tex