fifth commit
Merge branch 'master' of https://github.com/Tuss4/trickfeed.django

Github told me so