Some useless changes that will be overwritten.
Merge branch 'master' of github.com:tamsler/training1

Conflicts:
	app/index.html
	app/js/controllers/main-controller.js