Difference between  vs scope
zippy with templateUrl
Merge branch 'zippy_with_templateUrl'

Conflicts:
	index.html
	main.js