Final fix. No code changed just fixed style xml to run on lab machines
Merge branch 'master' of github.com:blavin/assignment1