Bad changes. By philip
Merge branch 'master' of github.com:willcrichton/mystro
For Dillon.
Merge branch 'master' of github.com:willcrichton/mystro