couple more comments
Merge branch 'master' of git@github.com:heike/sine-illusion
Merge branch 'master' of git@github.com:heike/sine-illusion
added code for linear and quadratic approximation
Merge branch 'master' of git@github.com:heike/sine-illusion

Conflicts:

	SineIllusion.Rnw