Create django project
Create first view
Create first template
Use template tags
Use filters
Fix tweets list
Merge branch 'step-02-firsttemplate' into step-03-tags
Merge branch 'step-03-tags' into step-04-filters
Inherit from base.html
Create Tweet model
Add 'ago' to the template
Merge branch 'step-04-filters' into step-05-inheritance
Displays tweets from database
Merge branch 'step-05-inheritance' into step-06-firstmodel
Merge branch 'step-06-firstmodel' into step-07-database

Conflicts:
	dwitter/website/templates/website/index.html
Add database
Implement individual page for a tweet
Create profiles for users
Have followers
Enable admin app