added permalinks
added permalinks
edited person model
Merge branch 'creffett'
Merge branches 'master' and 'ben'

Conflicts:
	hackathon/stepup/models.py
Merge branch 'master' of https://github.com/jrouly/srct-vahack
adding stuff for the views and the basic templates
Merge branch 'daniel'
fixed models
Ignore *.pyc
Start the admin.py file