style
Merge branch 'master' of https://github.com/lastmayday/lastmayday.github.com