Add header-footer template
Fix Merge Conflicts
Add calendar.html, header and footer reusable template, comment database assignment for heroku deployment
Link pages