Working on js stuff
Merge branch 'master' of https://github.com/Lykve/HayDJ

Conflicts:
	Webserver/.idea/workspace.xml
Updated ignore