a
Merge branch 'master' of https://github.com/heri28/oop

Conflicts:
	Counter Pulsa.suo
	Counter Pulsa/bin/Debug/Counter Pulsa.exe
	Counter Pulsa/bin/Debug/Counter Pulsa.pdb
	Counter Pulsa/obj/x86/Debug/Counter Pulsa.exe
	Counter Pulsa/obj/x86/Debug/Counter Pulsa.pdb
	Counter Pulsa/pulsa.cs