commit lang ang changes para mka pull
Merge conflict napud
Conflicts:
	javascript/another.js
	javascript/another.js~
changed pw