wroking m4

this is the working M4
Merge branch 'WOKRING-M4' of https://github.com/shadowfiles/CS-2340-Water-s-Warriors
Merge branch 'master' of https://github.com/shadowfiles/CS-2340-Water-s-Warriors