In class code changes
fix conflicts
Merge pull request #1 from ivanoats/master

changes from class