Merging branches with new updates
Merge branch 'master' of github.com:Hansenq/nere

Conflicts:
	app.js
Merge with file