Create .gitignore
First try commit
Try again
Msg
test commit
commit again
Merge branch 'master' of https://github.com/mbelley/automaduino

Conflicts:
	.gitignore
	web/js/automaDuino.js