test
Merge branch 'master' of https://github.com/stringaro-leo/6K

Conflicts:
	app/scripts/main.js