changing tr
Revert "changing tr"

This reverts commit bc19d88d7592bb6253b304f73fe90fafe6feee3c.
Revert "Revert "changing tr""

This reverts commit 92bcbd72306884644c94fb0ceaa30398667a4bbc.
Merge branch 'master' of https://github.com/dvn7035/TeamIceCreamProject

Conflicts:
	test.txt