Add Jade, start layout design lesson
Fix merge