Changed line
Merge branch 'master' of
https://github.com/studentsys-msu/EgitTraining.git

Conflicts:
	src/edu/msu/egit/training/ConflictTesting.java