Revert "Revert "Revert "Merge branch 'master' of https://github.com/Wawser/Wawser-V1.0"""

This reverts commit ed30850f6024a014fcd526e1b65ea4e64bce990f.