Simant added String
Added Atring
Merge branch 'master' of
https://github.com/University-Management-And-Scheduling/UMAS-Project.git

Conflicts:
	CS597-PROJECT/src/TestFile.java