Layout finished

layout has javascript and full iamge support
Merge branch 'develop' of https://github.com/hookkshot/WebEngAssignment into develop

Conflicts:
	views/layout.html