changes
Merge branch 'master' of https://github.com/jonathanysp/nextRIPTA

Conflicts:
	modules/addUser.js