add 'uptime' to .gitignore too
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from GLolol/master

add 'uptime' to .gitignore too