Added a getProperty("os.name") command.
Resolved a conflict. Merged the os.name and testing

Merge remote-tracking branch 'origin/master'

Conflicts:
	TestingGit/src/Main.java