first and last commit
fixed merge conshit
fixed ip
fixed esc-button
Merge pull request #5 from runeandersen92/gameTimer

Merged Michael's Game timer