30 minutes-method
conflict resolving
Merge pull request #34 from MaximeHerne/30minutes-method

30 minutes-method