committing changes to merge with others
Merge branch 'master' of http://github.com/ghostling/textbook
Fixed style of class declarations in models.py and added comments to many functions inside of main. Not working yet, but nothing is broken either