Added "Chippie" page
Fix merge conflict