can't figure out how to sync this
#3 - created some semi-static pages for EMSI, EBI, CEOM
#3 - created semi-static content for EMSI, EBI, and CEOM
Merge branch 'master' of https://github.com/mattrebor/emsiweb.git

Conflicts:
	src/main/webapp/WEB-INF/views/header.jspx
	src/main/webapp/WEB-INF/views/secondary-nav.jspx
Merge branch 'master' of https://github.com/mattrebor/emsiweb.git

Conflicts:
	src/main/webapp/WEB-INF/views/secondary-nav.jspx
Modify app.js by rob
Added some new lines
removed all names
Merge pull request #48 from mattrebor/chui

removed all names
Merge branch 'master' of https://github.com/mattrebor/emsiweb.git into
rob

Conflicts:
	src/main/webapp/WEB-INF/views/header.jspx