Action class added
Merge branch 'master' of https://github.com/jkr241/project2