updated timeout style
Merge branch 'cgdevelop' into 207-style-timeout
updated ignore
updated gitignore
Merge pull request #98 from CG-CamSys/207-style-timeout

updated timeout style