Add User Registration
Merge remote-tracking branch 'cathal/master'

Conflicts:
	app.js