First commit
Merge github.com:SkouRene/electronic-2

Conflicts:
	.gitignore
d