just some backup before trying ajax

before I damage it further.. just to back up.
Merge branch 'master' of https://github.com/morrisseymeg/Database-Project

Conflicts:
	mainideas.php