Trying to get through conflict
Merge branch 'master' of https://github.com/Samusaaron3/Pulseman.git