Merge branch 'datamodel' of https://github.com/Limu123/redidit_ng_2 into datamodel

Conflicts:
package.json