Fixing Shiny?

Merge branch 'master' of https://github.com/heike/sine-illusion

Conflicts:
	Shiny/server.R
Merge branch 'master' of https://github.com/heike/sine-illusion