Made edits to sidebar
Merge branch 'master' of https://github.com/limichaelc/PTX2

Conflicts:
	ptx2/urls.py
Removal of extraneous templates directory