adds 'push not in' function
adds skolimization
unfinished business
merges files