Add some basic styles
Fixing conflicts
Spacing and alignment
Merge branch 'master' of https://github.com/jamesdphillips/ml-staffer