trying to update my branch (jeff)
initial push to my branch
Merge branch 'master' of https://github.com/n4sa/RedditClone

Conflicts:
	Feature.txt
Merge branch 'jeff-branch' of https://github.com/n4sa/RedditClone

Conflicts:
	Feature.txt