initial commit
added reamde and license
fix conflict