started styling
updated styling of input form
change server
fix merge conflicts
adding backbone views
Merge branch 'dev' of github.com:ppark482/Feelings-App into dev
view templating
editing views
Add avatar URL
fixed merge conflicts
Fix merge conflicts
added views and templating
Fix merge conflicts
Merge branch 'dev' of github.com:ppark482/Feelings-App into dev
updated server with avatar images
work on avatar
Merge branch 'dev' into paul
templating is working
Fix merge conflicts
added gridding