Merge branch 'test3' into 'master'

modify for pull request See merge request !8

Merge branch 'test3' into 'master'
modify for pull request See merge request !8
12e148e2 · Steve Androulakis · 7aa5020a · 5c61037a · 12e148e2
Commit 12e148e2 authored Jan 11, 2016 by Steve Androulakis
--- a/essay
+++ b/essay
+make changes...:wq
+:wq
 Hello, we are Steve and Grischa and we'll be your git pilots today.

 We're just about to disembark onto the runway. There are a few other git