rm tmp folder
resolved confilct'
user default profile image
Merge branch 'dev' of github.com:matyikriszta/WDI_Project2 into dev
resolved conflicts
bundled & migrated