Adding a change to index
Fixing the merge issue:
Merge branch 'master' of github.com:nicdev/git-training into sandbox
Merge pull request #13 from nicdev/sandbox

Adding a change to index