Add git ignore
Merge branch 'master' of https://github.com/johnvanweel/Home-Automation

Conflicts:
	audio-node/audio-node.iml
Merge branch 'master' of https://github.com/johnvanweel/Home-Automation

Conflicts:
	audio-node/audio-node.iml