manual commit
Merge branch 'master' of https://github.com/timpandrews/github-for-web-designers

Conflicts:
	index.html