commit changes to git ignore
Merge branch 'develop'
UI design
UI design
resolved conflicts
UI deign