*Fiew design changes *
Merge branch 'master' of https://github.com/aV1rus/Capstone_Project

Conflicts:
	templates/base/sidebar.html