tutorial part 2 complete, modified some of part 1 to be consistant with django1.6 instead of the dev version