refactoring
merged classes
Merge branch 'master' of https://github.com/tmeshorer/allturksproject.git
changes