Merge branch 'master' of github.com:itsapi/webDesign

Conflicts:
	README.md
Merge branch 'master' of github.com:itsapi/webDesign

Conflicts:
	README.md