tar bort merge kod
haroku
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/views/KundInfo.html
	public/views/SkapaAnvandare.html
	public/views/admin.html
	public/views/anstalld.html
	server/config/config.js