conradosalinas/interactive_media_portfolio — pull request #5 by conradosalinas (2014-12-20 04:05:44+00:00)
Title: Merged to 'master'

I think this was really messy, I created a new branch 'final_hausen' to upload my final website. Then I switched to my master branch to merge 'final_hausen.' From there, I deleted a file because it said I couldn't merge without fixing that error or something. It was an old contact.html file that I wasn't using anymore, so that's fine. So everything is merged to my master brand, but I see a lot of commits on Dec 19, 2014. I'm not even sure if you wanted us to merge to the master branch yet or not. The link to the live site is: http://hausen.viobear.com