add data model
Merge branch 'master' of https://github.com/Scrumblet-Team/Scrumble

Conflicts:
	app/routes/routes.js