Debugging s and w both moving forward
Merge branch 'master' of https://github.com/RingOfFireOrg/FT2014