conflict?
Merge branch 'master' of https://github.com/Monds/Timple.git

Conflicts:
	WebContent/index.jsp