Fix merge conflicts
Merge branch 'dev' of github.com:ppark482/Feelings-App into dev
Merge branch 'dev' into paul
templating is working