Added error log
Merge branch 'arcBus'

Conflicts:
	error.c