Added Error Log
Merge remote-tracking branch 'origin/master'

Conflicts:
	tmp/error.log