Merge conflict resolved
Merge remote-tracking branch 'LocalGit/master'
Commit GitHubbed project line