..
..
..
Merge branch 'master' of https://github.com/cskilbeck/TypeScriptTest

Conflicts:
	TypeScriptTest/public_html/index.php