fixed error from merge
Added calender class. All functions are implemented except operator<<. Also made simple test class test_calender.cpp