New FAQ file
Merge branch 'new_FAQ_file' into dev
Merge branch 'dev' of github.com:darrinkatz/workshop into dev
Merge branch 'dev' of github.com:darrinkatz/workshop into dev