*Commiting sidebar changes **
Merge branch 'master' of https://github.com/aV1rus/Capstone_Project

Conflicts:
	settings/views.py
	static/css/mainStyle.css
	static/css/sidebar.css
	templates/base/base.html
	templates/base/base_home.html
	templates/base/sidebar.html