Develop

Merging to master after changing plans to do newsfeed