testing conflicts
Merge branch 'master' of https://github.com/dvdstrk/github-for-web-designers

Conflicts:
	README.md