push from the master branch
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.php
header added