stuff to update
fixing colors
working the changes
Merge branch 'master' of https://github.com/timm/timmnix

Conflicts:
	dotemacs