made things fit together a little better
Merge branch 'master' of github.com:rcarlso1/ML-FinalProject2012-EdModeling