changed
changed
changed
changed
changed
changed
managed to complete the top part of the page
Merge branch 'master' of https://github.com/robccarey/SkyAccessoriesWebsites
seperated header and footer into layout folder
design using bootstrap, login and dynamic employee navigation - done
design using bootstrap, login and dynamic employee navigation - done
design using bootstrap, login and dynamic employee navigation - done
design using bootstrap, login and dynamic employee navigation - done
managed to get few tasks completed: SAS-67
created a big search box, managed to get the policy tab to work
updated the navigation hover effect to match sky navigation
updated the footer
design using bootstrap, login and dynamic employee navigation - done
design using bootstrap, login and dynamic employee navigation - done
Merge branch 'bootstrap'

Conflicts:
	web/bootstrap/index.jsp