commit to merge with Sam
commit to merge with Sam
merge with master
adding the login decorator
Fixing the login decorator. Renamed view.py to views.py"