final styling
done styling for now
fixing conflicts
Merge branch 'styling'