includes smileys
conflicts solved
Merge branch 'master' of https://github.com/micaeloliveira/WebDesignExamples

Conflicts:
	testLayout/index.html
	testLayout/style.css