[READ-ONLY] Mirror of https://github.com/chrisvander/merx. A Meteor-based web app to help make financial education accessible to everyone through detailed, interactive experiences and courses.

cleaned merge conflict master


+11 -37
1 changed file