making sidebar
Merge branch 'master' of github.com:DavidSaxon/E.C.C.E.N.T.R.I.C.

Conflicts:
	app/controllers/testing_controller.rb