the rango tutorial step 3 complete
configured TEMPLATES_DIR
changes to poll db
merging all changes
what merging there are