change main
Merge branch 'test-confl'

Conflicts:
	app.js

thats fine