Making new repo
Servlet Working on JBOSS
Stories 7 and 8 working
Merge branch 'mymerge'
Story 6, 10 added
Tiny test change
more test changes
Operator DAO and EJB added and working on full slice
Operator DAO and EJB added and working on full slice
Populating structure in place
graph now displaying on webpage
Populating coming along
Merge branch 'master' into mergepopulate

Conflicts:
	group1-sprint2/src/main/java/com/ericsson/project/importing/ImportData.java
	group1-sprint2/src/main/webapp/index.html
Populate basic code IN
query 13 1/3 complete
Population works (with minor database changes)
Graph now shows all combo's with respective failures
13
Merge branch 'master' of
https://github.com/otisliddy/group-project-repo.git

Conflicts:
	group1-sprint2/src/main/java/com/ericsson/project/ejbs/IOperatorEJB.java
	group1-sprint2/src/main/java/com/ericsson/project/ejbs/OperatorEJB.java
	
Query 13
Added some new html