Improved facts and tips and timing
added game over messages
merge conflicts
Fixing merge conflicts