edit file
Merge branch 'master' of https://github.com/afituri/centers
Merge branch 'master' of https://github.com/afituri/centers
Merge branch 'master' of https://github.com/afituri/centers
Merge branch 'master' of https://github.com/afituri/centers

Conflicts:
	public/javascripts/adduser.js
Merge branch 'master' of https://github.com/afituri/centers
adduser