changes to file
Merge branch 'master' of https://github.com/levfurtado/iMedia-iMT-101 into ldion

Conflicts:
	index.html
Added name
Merge pull request #2 from levfurtado/ldion

Ldion
More merge changes