pw 1
Merge branch 'master' of https://github.com/Team1982/Test1

Conflicts:
	newfile.php