Merge branch 'master' of heroku.com:calupe
uncommented out admin code
Merge branch 'master' of github.com:upenu/website

Conflicts:
	website/admin.py

Fixed merge