quick styling fixes
fixed conflicts
Merge pull request #9 from malloryreuls/quickfix

quick styling fixes