first commit
Merge branch 'master' of https://github.com/ndaussy/OpenClassRoom

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.component
	.settings/org.eclipse.wst.common.project.facet.core.xml
	WebContent/WEB-INF/edit_subtitle.jsp
	src/com/subtitlor/servlets/EditSubtitle.java