included a feed div
merged develop branch
merged with develop