Merge branch 'master' of github.com:igaln/Saydirgac

Conflicts:
	routes/reading.js