Merge branch 'master' of https://github.com/odschulz/Web-Fundamentals-Team-Project

Conflicts:
	Georgi/ImageMap/test.css
	Georgi/ImageMap/test.html