Updated Services
Merge branch 'master' of https://github.com/probie93/penguin

Conflicts:
	assignment7/penguin/Mainindex.php