better colors
Merge branch 'master' of https://github.com/sandb/ohm2013

Conflicts:
	ohm2013.c