Initial Commit
Fixing merge conflict with readme, should not have initialized the repo on github...