rev1
Merge remote-tracking branch 'origin/rev1'

Conflicts:
	AtmelCodingAssignment.atsuo