change server
fix merge conflicts
Merge branch 'dev' of github.com:ppark482/Feelings-App into dev
Add avatar URL
fixed merge conflicts
Fix merge conflicts
added views and templating