Added Bootstrap to base view
Added Bootstrap to base view
Merged multiple base views

Conflicts:
	code/umagellan/UMagellan/templates/base.html