Updating Preferences.
Updating preferences.
Local Commit for assets.
Merge branch 'master' of https://github.com/JacobBarba/FinalProject_HappiestSnowFriends
Trying to fix heroku
Heroku bug fixing.
Fixed newsfeed.
Pulling new changes