Duplicate code removal
Merge pull request #42 from IPA-Lets-Study-Together/dev

Duplicate code removal