Fixed the overall layout of the site
Merge branch 'master' of https://github.com/mwcaisse/webware-final
Merge branch 'master' of https://github.com/mwcaisse/webware-final