check 1
master 2;
hey
as
Merge branch 'master' into dev

Conflicts:
	js/master.js