December 3rd pull requests

I'm not sure if I'm doing this right, ignore these two files:

-header comments constants.h
-headercomments main.cpp

Do Not Merge these files, they are incomplete comments