abra kadabra
last one
Merge branch 'master' of https://github.com/andkirby/testsq

Conflicts:
	index.php