Convert file:line into file +line.
Merge branch 'master' of github.com:mikelward/scripts

Conflicts:
	edit