Merge branch 'master' into 'master'

Changes by Shahaan See merge request !3

Merge branch 'master' into 'master'
Changes by Shahaan See merge request !3
49e040bb · Steve Androulakis · 418135f5 · 61e46580 · 49e040bb
Commit 49e040bb authored Jan 11, 2016 by Steve Androulakis
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

essay essay +4 -0

No files found.
--- a/essay
+++ b/essay
@@ -5,3 +5,7 @@ projects ahead of us waiting to take off, so we'll have to wait 5 or 10
 minutes until forking.

 Thank you for flying with MeRC Air.
+
+
+
+Change proposed by Shahaan.