Added one line
Merge branch 'master' of github.com:michaelpat/test

Conflicts:
	welcome.txt
- Corrected both versions!