Naunahan kita :p
test conflict
Merge branch 'master' into local_jahlex

Conflicts:
	activity1.txt