keep .idea/libraries out of git repository. Android Studio should autogen them when it needs to.
This will solve our conflict issues, but we can revert it if necessary