put my name in
port cpp and header files
Merge branch 'master' of git://github.com/AlexMaxseiner/612-2013 into alex

Conflicts:
	AUTHORS.rst