stuff and sublime project 3 config
some stuff
fixed conflicts