Fixed 404 errors and tweaked template conditional variables
Merge pull request #34 from pjackson28/master

Fixed 404 errors and tweaked template conditional variables