views
views
views listing
views listing
Merge branch 'master' of https://github.com/limichaelc/PTX2

Conflicts:
	ptx2app/views.py
authenticaiton
authenticaiton
authenticaiton
authenticaiton
authenticaiton
authenticaiton
authenticaiton
authenticaiton
authenticaiton
authenticaiton
authenticaiton
authenticaiton
authenticaiton
authenticaiton
authenticaiton