format code - clang-format 3.5
Merge branch 'master' of github.com:SteveViss/C-STMFor