# Conflicts: # app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java # app/src/main/res/layout/fragment_personal.xml
- added avatar image class and implemented on map on note display (personal and map views)