Scrolling for Key Strokes
Merge branch 'master' of https://github.com/appiphony/Phillips

Conflicts:
	index.html