ignore all txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	view/login/error_log.txt