Easter Egg and Error
Merge branch 'dev' of https://github.com/fr3ddy/WebEngeneering into dev