commit the changes new
try to push
try again
some message .. anyways not pushing
Merge branch 'master' of https://github.com/amarnath1234/Amars-Git.git

Conflicts:
	newfile.php
new files
sdfklm