fix conflicts
fix conflicts
Merge branch 'master' of github.com:charlyy/Showerthoughts
Merge branch 'master' of github.com:charlyy/Showerthoughts