I'm making another change!
Merge branch 'master' of git@github.com:lynntesia/Data-Tamers.git
Making page my own!
Merge branch 'master' of git@github.com:lynntesia/Data-Tamers.git

Conflicts:
	sample-project/src/main/webapp/WEB-INF/views/home.jsp
Merge branch 'master' of git@github.com:lynntesia/Data-Tamers.git