small changes
Merge branch 'master' of https://github.com/pamaral148/assignment3

Conflicts:
	public/assets/js/clientsAjax.js