ndex changes
Merge branch 'master' of https://github.com/neilff/superherobuzz

Conflicts:
	index.php