debugged main file, parts of other files
Merge branch 'master' of https://github.com/selena731/15418-final-project
deleted files