popover dismiss works
Merge branch 'master' of github.com:anneback/iprog-project

Conflicts:
	Main.html
	mainController.js