implementing /session/:sessionId/timeouts
Merge remote-tracking branch 'upstream/master'
Removing unneccessary class
Style cleanup
Merge pull request #16 from penguinho/master

Style cleanup