before btest
added some comments
deleted a empty newline
Merge branch 'btest'

Conflicts:
	index.php