Not sure what I changed

This morning....
Merge remote-tracking branch 'origin/master'

Conflicts:
	mainideas.php