Feed successfully implemented
Got rid of a warning by returning true for a boolean function
Created a git ignore and removed .DS_Store and the xcuserstate file from commits
Got rid of the same stupid commit things in Feed branch
Removed xcuserstate from master tracking
Merge finally succeeded! Victory is mine hahaha