asdf
Merge branch 'master' of
https://github.com/otisliddy/group-project-repo.git

Conflicts:
	group1-sprint2/src/main/java/com/ericsson/project/dao/ICallFailureDAO.java
	group1-sprint2/src/main/java/com/ericsson/project/rest/ImportingRestService.java
	group1-sprint2/src/main/webapp/index.html