Merge pull request #1 from fryingpan/master

Pull to beta
Merge branch 'master' of https://github.com/fryingpan/Assignment2
New Masterfile for State Change