'classwork from 20140224'
Merge branch 'master' of github.com:YellowDinar/django-bars