before merge
removed *.pyc
reverted views.py