12/12/14 autonomous
Merge remote-tracking branch 'origin/master'

Conflicts:
	peter.c
	utility.h