Basic bootstrap
More base content goodness
Merge branch 'design'

Conflicts:
	DisSoNet/templates/base.html
Merge branch 'master' of https://github.com/Solanar/CMPUT410-Project