BP-17: added some content to text.txt
BP-17: fixing accidental commit
BP-17: fixing accidental commit
Merge branch 'master' of https://github.com/dudewad/BPeterson
Merge branch 'local-dev-bpeterson'

Conflicts:
	test.txt