4
Merge branch 'master' of https://github.com/typeof/test.git

Conflicts:
	s.js