bug fix
Merge branch 'master' of https://github.com/paulparton/crudbrella

Conflicts:
	index.js