added more to line 2
Merge branch 'master' of https://github.com/xjdesigns/JTestMe

Conflicts:
	index.html