Local change
Local change
No Funny J stuff.
Merge 179ffb0e7b5d10e99148f80f7d2152f2da32ad1c into d48cd0e9e86e75ba35f6e1666a4dbed2107c184a
Merge commit 'refs/pull/6/merge' of https://github.com/githubteacher/example-basic