Inconsquential change
adding my name to AUTHORS.rst
Update AUTHORS.rst
Merge pull request #4 from borahhong/patch-1

adding my name to AUTHORS.rst
Merge branch 'master' of github.com:anidev/612-2013

Conflicts:
	AUTHORS.rst
Changed readme
More updates to readme
put my name in
Update AUTHORS.rst

added myself
Update AUTHORS.rst
added my name
port cpp and header files
Merge pull request #6 from AdrianDeVera/patch-1

Update AUTHORS.rst
Merge branch 'patch-1' of git://github.com/XanMead/612-2013 into xan

Conflicts:
	AUTHORS.rst
Merge branch 'master' of git://github.com/jbramnick/612-2013 into jim

Conflicts:
	AUTHORS.rst
Merge branch 'master' of git://github.com/AlexMaxseiner/612-2013 into alex

Conflicts:
	AUTHORS.rst
Data Encapsulation :)
Merge branch 'master' of git://github.com/JeffTolbert/612-2013 into jeff
Fixed Jeff's merge
Fixed authors