Initial Commit
initial commit
added README
fixed merge conflicts from files generated by github