Merge remote-tracking branch 'origin/master'

Conflicts:
	about.html
Merge branch 'master' of https://github.com/AAJumbito/8-queens

Conflicts:
	queens.php