trying to show connections in app
client main js
Merge branch 'master' of https://github.com/andrewj1990/A3

Conflicts:
	DAO.js
	main.js
deleted dao