Three-way conflict resolution.
Merge branch 'master' of github.com:willvousden/shell