Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge

Merged branches.
Week 3 Work

Working on week 3.
Merge branch 'gh-pages'

Conflicts:

avfDemo/platforms/ios/demoApp.xcodeproj/project.xcworkspace/xcuserdata/D
avid.xcuserdatad/UserInterfaceState.xcuserstate
Fixed issues.

Copied old files from gh-pages.  Merged into master.