makefile test
Merge branch 'master' of https://github.com/errr9527/Test

Conflicts:
	Makefile
	main.cpp