updates
Merge branch 'master' of github.com:aliwatters/sandbox

Conflicts:
	2014/20140619-clientside-passhash/index.html