add Author
Merge branch 'master' of https://github.com/celeC/GitTest.git

Conflicts:
	WebContent/WEB-INF/js/test.js