deleting 2
getting rid of 2 finally
shit is happening
Merge branch 'master' into feature_req
Removing
Merge pull request #1 from Caminyx/feature_req

Feature req