conflict res
Merge branch 'master' of https://github.com/jorgenkg/atb_project

Conflicts:
	scripts/main.js