photo
Merge branch 'master' of https://github.com/charonme/penelope

Conflicts:
	initconstants.h
	nlpcore.ino
	penelope.ino