Complete Part 1
Completed Part Two
removing .pyc
merging