idiot change
just another commit
Merge branch 'issue666'
don't need this comment anymore
stupid comment change
stupid comment change on Makefile
stupid comment change on Makefile
Merge branch 'coldfix'

Conflicts:
	Makefile
	counters.c