chat files
Merge branch 'pat'
funds
dashboard conflicts
index page
Merge branch 'ren'
conflicts
Merge branch 'JellaDivina'
main config
Merge branch 'ren'
conflicts
map
working app
DB update
profile modify