chhhhh
Merge branch 'master' of https://github.com/johntk/JAKD.git

Conflicts:
	UserLog.txt