Identacion sobre jsp
merged register.jsp
Added to gitignore pattern for ignore merged files