getting rid of orig file from merge conflict
updating landing page
Merge pull request #25 from CSKit/homepage

Homepage