Added leap year determination; combined solar and lunar into one file