reset
Merge branch 'Styling' into development
Merge branch 'development'