Signed-off-by: isnade <ainaoe@yahoo.com>
change
Merge remote-tracking branch 'origin/master'

Conflicts:
	pagenotfound.php
	style.css