Merge pull request #1 from silsha/master

getting back current development state on origin branch
Merge branch 'master' of https://github.com/silsha/fnordcredit
re-introducing the timeout to jump back to the main page
Merge pull request #35 from tabascoeye/master

re-introducing timeout.