Merge pull request #29 from chrisvans/Anthony

Updated home screen, fixed a couple bugs
Quick bugfix
Quick bugfix
updated views and base.html so that the Page we're on has the active class in the nav bar