WIP: we can insert data into mysql - yippie
Merge remote-tracking branch 'origin/master'

Conflicts:
	rest-api/package.json