Add some test text
Merge branch 'master' of https://github.com/RaritanATTeam/test_git into brian_test

Conflicts:
	test.txt
Merge pull request #3 from RaritanATTeam/brian_test

Test pull request