git crazy
Merge branch 'master' of https://github.com/se7enmilgram/generator
git crazy
Merge branch 'master' of https://github.com/se7enmilgram/generator
git crazy
Merge branch 'master' of https://github.com/se7enmilgram/generator

Conflicts:
	newGenerator.ino
Merge branch 'master' of https://github.com/se7enmilgram/generator