Styling and merging.
:wq
Merge branch 'master' of github.com:esphen/fooz