Merge step done
Still stuck before pulling
Merge branch 'master' of https://github.com/binarydepth/new_stuff

jnojnono Pulling freak was here
Pull from zahory done