Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js

asd
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js