On the othe computer I addded some files that are now in gitignore. I need to commit them to merge :(
Working on DayView clicks and style changes...