maj style
Merge branch 'master' of github.com:prbaron/prbaron.github.com