Adding 404 template for error handling (looking to get out of debug mode!)
Merge branch 'master' of https://github.com/bethlakshmi/GBE2
Repairing previous merge damage