file updated

first program
Merge remote-tracking branch 'origin/master'

Conflicts:
	ipercent.cpp