Removed remaining merge conflicts.
Merge branch 'master' of https://github.com/wet-boew/wet-boew