Added new test text
Merge commit 'a968bca1ff8a5f18843de9634461d948aa573c4a' into develop

* commit 'a968bca1ff8a5f18843de9634461d948aa573c4a':
  Added new test text

Conflicts:
	index.html