conflict resolution
Merge branch 'master' of https://github.com/audunthecyborg/audunio

Conflicts:
	package.json