added 3rd sample data
fixed rebase conflict
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	public/index.html
	server.js
changes made