Added .idea t gitignore
Merged master to master