I should have done this a while ago
added README.MD
added LICENSE
fixed merge conflicts