Chapter 5. Models and Databases
Chapter 6. Models, Templates and Views
Merge branch 'master' of https://github.com/AlexMordred/rango

Conflicts:
	rango/admin.pyc