Merge branch 'master' of github.com:jags9415/innovative-ideas

Conflicts:
	mysql/innovative ideas.mwb
mensaje
commit
Merge branch 'master' of github.com:jags9415/innovative-ideas

Conflicts:
	index.php
	mysql/innovative ideas.mwb
	mysql/script.sql