Added calendar
Merge branch 'gh-pages'
Added week1