Merge remote-tracking branch 'remote/master'
updating files that should be ignored
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.DS_Store
	sources/.DS_Store
Corrected a small typo
Merge pull request #35 from timrichardson/master

Correction to minor typo (missing ' ' )
Added text about creating SQLFORM.factory with form=SQLFORM.factory(*fields)
In the news group on Feb 11, Massimo told me that track_changes only works for mmodules in the application; the book says something different so I have corrected it.
Merge pull request #36 from timrichardson/master

added a few lines re creating SQLFORM.factory wth *fields
some edits