changes dates for May
merges conflicts to index.html