testing and learning git..
Merge branch 'master' of https://github.com/picaloz/spoon-knife

Conflicts:
	index.html