added data indexed by year as m_ in milka.h and .cpp
added data indexed by year as private data members
merge with Steve's changes