initial commit
removed authors file
changed readme
cleaned project
fixed conflicts