Merge branch 'migrate-readme-yaml' of https://github.com/cloudposse/terraform-aws-jenkins into migrate-readme-yaml

Author: vadim-gleif

README.md

@@ -444,6 +444,7 @@ Check out [our other projects][github], [apply for a job][jobs], or [hire us][hi
 |  [![Andriy Knysh][aknysh_avatar]](aknysh_homepage)<br/>[Andriy Knysh][aknysh_homepage] | [![Ivan Pinatti][ivan-pinatti_avatar]](ivan-pinatti_homepage)<br/>[Ivan Pinatti][ivan-pinatti_homepage] | [![Sergey Vasilyev][s2504s_avatar]](s2504s_homepage)<br/>[Sergey Vasilyev][s2504s_homepage] |
 |---|---|---|
 
+
   [aknysh_homepage]: https://github.com/aknysh
   [aknysh_avatar]: https://github.com/aknysh.png?size=150
   [ivan-pinatti_homepage]: https://github.com/ivan-pinatti

README.yaml

@@ -316,8 +316,21 @@ include:
 # Contributors to this project
 contributors:
   - name: "Andriy Knysh"
+<<<<<<< HEAD
     github: "aknysh"
   - name: "Ivan Pinatti"
     github: "ivan-pinatti"
   - name: "Sergey Vasilyev"
+=======
+    homepage: "https://github.com/aknysh"
+    avatar: "https://github.com/aknysh.png?size=150"
+    github: "aknysh"
+  - name: "Ivan Pinatti"
+    homepage: "https://github.com/ivan-pinatti"
+    avatar: "https://github.com/ivan-pinatti.png?size=150"
+    github: "ivan-pinatti"
+  - name: "Sergey Vasilyev"
+    homepage: "https://github.com/s2504s"
+    avatar: "https://github.com/s2504s.png?size=150"
+>>>>>>> 541eb69d3961714fead6dfab98bb9918cbe9b3f3
     github: "s2504s"