merging my files with yours
i have pushed my code everything is working well, after you merge files run rake db:migrate, i changed something in the footer to Zim academy