1.0
Merge branch 'master' of https://github.com/rudyfr/arduinoClock

Conflicts:
	README.md
Initializing repository
Initializing repository