intial commit
added everything
fixed conflicts