updated repo
more test
Merge remote-tracking branch 'zack/master', fixed compile errors

Conflicts:
	main.cpp
	main.h