Guessws

resolved conflicts, and pep8 everything and removed some old files