Added pop-over web page interaction
Merge branch 'client-dev' of https://github.com/mattjarvis/colleen into mattjarvis-client-dev

Conflicts:
	client/index.html
	client/js/config.js