landing page done
fixed merge conflicts
Merge pull request #57 from obeid/release-1

landing page is now included
Merge remote-tracking branch 'upstream/release-1' into release-1