first import
added basic readme
fixed conflicts