Merge branch 'master' of https://github.com/jessenery/testeGit

Conflicts:
	file1.cs
Merge branch 'master' of https://github.com/jessenery/testeGit