conflict in README.md
Merge branch 'master' of github.com:bluciam/anita-jsp-2005

Conflicts:
	README.md