tmp build
Merge branch 'sidebar'

Conflicts:
	Final_Report/build/mainfile.pdf

Removed unneeded branches