ignore shit
fixed conflicts, new is the new master
Update readme.md