reformat code
Merge branch 'master' of https://github.com/Doomsta/doomsta.github.com