Take3

Hey, I think I just need to merge our two files and I could finish the website before the weekend. What what.