fixed conflict
Merge branch 'master' of github.com:weo-edu/meteor