Added S3 api
Added more igore file to gitignore
Implemented merge function. Added websocket servlet