Further work on django views
Merge branch 'master' of https://github.com/ireardon/hack-brown
Updates yo
Merge branch 'master' of https://github.com/ireardon/hack-brown