made new branch off of dev to resolve merge conflicts since code changes
were small bug/singleEventInMonth no longer valid