merged origin
encoding
added /.idea to .gitignore