3.
Merge branch 'master' of https://github.com/PPilger/Web-Engineering

Conflicts:
	.DS_Store