styling
merges
layout
progress
Merge branch 'master' of github.com:redfern314/sourcegenius
merges in changes