another change
Merge branch 'master' of git@github.com:inverts/Data-Tamers.git

Conflicts:
	sample-project/src/main/webapp/WEB-INF/views/home.jsp