Another change
Resolved Conflict
Changes and resolving conflicts
Merge branch 'master' of https://github.com/dininski/Telerik-Academy

Conflicts:
	TestFileToBreak.txt