Local squash
Basic page structure
test 2
test 3
test 4
test 5
test 6
test 7
test 8
test 9
test 10
commit 11
Merge remote-tracking branch 'origin/development'

Conflicts:
	index.php
	test.txt