paul commit test
Merge branch 'master' of https://github.com/gubee/Fluo

Conflicts:
	src/Fluo.cpp