test commit
Merge branch 'master' of https://github.com/agilejs/2014-10-typesafe
Merge branch 'master' of https://github.com/agilejs/2014-10-typesafe

Conflicts:
	client/index.html