sidebar with bootstrap css
commit issues
resolving issues
resolving commit
Merge branch 'master' of https://github.com/itsdebbiee/187UsabilityEval

Conflicts:
	Website/js/script.js

merging script