Add triangle 7
git ignore and view Controller modified
solved conflict
solved conflict 2