resolve interrupt conflicts (bug #5)
Merge branch 'master' of https://github.com/wash4all/open-turbidimeter-project

Conflicts:
	software/turbidimeter/turbidimeter.ino