work on avatar
Fix merge conflicts
added gridding
Merge branch 'dev' of github.com:ppark482/Feelings-App into dev
added font