oops
Merge remote-tracking branch 'origin/master'

Conflicts:
	header.php
Merge branch 'master' of https://github.com/kteio/tad