Edits
Merge branch 'master' of https://github.com/gruby20/myfreeapp

Conflicts:
	package.json
	server/datasources.json