log file implemented

log file implemented
Merge branch 'master' of https://github.com/othtim/flaming-avenger

Conflicts:
	userlist.txt