Merge branch 'master' into master

Cryptophobia · web-flow · commit 065a23514c88 · 2018-09-11T12:47:58.000-04:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -2,4 +2,3 @@
 
 This project is part of Hephy. You can find the latest contribution
 guidelines [at the Hephy project](https://github.com/teamhephy/deis/blob/master/CONTRIBUTING.md).
-

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,3 @@`
`2`	`2`
`3`	`3`	`This project is part of Hephy. You can find the latest contribution`
`4`	`4`	`guidelines [at the Hephy project](https://github.com/teamhephy/deis/blob/master/CONTRIBUTING.md).`
`5`		`-`