adds header function and variable
adds master veriable and function
Merge branch 'header'

Conflicts:
	app.js
	utils.js
adds blablabla
Merge branch 'header'