first commit
Merge branch 'master' of https://github.com/endil920/Discuss
I made a mistake