merging with remote
update igores
merged from remote
fix linefeed in .gitignore
sophisticate jsp output