Playing around with themes
Fixed merge conflicts: app js, react js, app html
Fixed merge conflic in dev log
Fixed merge conflict in dev sql and dev log
Merge conflict in dev sql and dev log
Fixed merge conflicts dev sql and log
New theme added
Merge branch 'front_end'
resolving merge conflict with light blue theme