Merge pull request #1 from hamchapman/master

Time sort of working
Merge pull request #2 from hamchapman/master

Fixed time issues with loading from databse
Updated to match Heroku production code from Natalie's Github