update2
Merge branch 'master' of https://github.com/huntdog1541/SN1PR5

Conflicts:
	main.c