Added documentation on enabling two-factor authentication to go with
the enhancement patch submitted on web2py github (#431)
Update 09.markmin

Added a note in the extra fields section saying you need to clear sessions if you want the changes to be reflected in auth.user
more small changes to Chapter 06
typo (stray line)
gitignore tweaks
Merge branch 'db_quoting'

Conflicts:
	.gitignore
some improvements to the DAL chapter: about using DAL standalone, more about commit in modules
Merge pull request #202 from ortgit/enhancement/two_step_authentication

Added documentation on enabling two-factor authentication
Merge pull request #224 from leonelcamara/master

Update 09.markmin
Merge pull request #227 from timrichardson/db_quoting

some minor changes to ch6 DAL which I left out from prior PR
Merge pull request #229 from timrichardson/DAL_standalone

some improvements to the DAL chapter: about using DAL standalone, more a...
updated profiler command line option

Profiler takes directory as an argument, not filename.
Also added a note about runsnakerun tool to analyze the profiler output
Merge pull request #230 from mandarvaze/patch-2

updated profiler command line option
Merge remote-tracking branch 'upstream/master'