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
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
Merge branch 'master' of https://github.com/robccarey/SkyAccessoriesWebsites
Merge branch 'bootstrap'

Conflicts:
	web/bootstrap/index.jsp
Merge branch 'bootstrap'

Conflicts:
	web/bootstrap/index.jsp
Delete index.jsp
Merge branch 'moins'
Merge branch 'bootstrap'

Conflicts:
	web/bootstrap/index.jsp
Merge branch 'master' of https://github.com/robccarey/SkyAccessoriesWebsites