more stuff...clarifying the person that r0x
Merge branch 'master' of https://github.com/iExperience/merge

Conflicts:
	index.html