.DS_Store
django skeleton
templates
facebook auth backend
Merge branch 'master' of github.com:pegapega/pegapega
new template