test commit

Conflicts:
	Resources/app.js