modals working kinda but maybe not anymore cause i changed things
Merge branch 'master' of github.com:joubin/CSC191

Conflicts:
	frontend/js/controllers.js
pushing things
modals working again
Merge branch 'master' of github.com:joubin/CSC191

Conflicts:
	frontend/index.html
	frontend/js/controllers.js