commit
Merge branch 'gh-pages' of https://github.com/laurabcn/angular into gh-pages

Conflicts:
	index - copia.html