mac
Merge branch 'master' of github.com:HBQ15/code

Conflicts:
	c++/a.out