Lame Timer
Fixed gitignore
Fixed merge conflicts
Removed db.yml
Merge pull request #12 from SamLau95/timer

Timer