Fix merge errors
Fix

Conflicts:
	ideas/index.php
Merge branch 'master' of github.com:kickstartmv/kickstartmv-website
Fix whatever