initial checkin
adding viewport code
Merge branch 'master' into gh-pages

* master:
  adding viewport code
  initial checkin