added .idea and ~ files