edossantos
Merge branch 'master' of https://github.com/levfurtado/iMedia-iMT-101 into edossantos
Merge branch 'master' of https://github.com/levfurtado/iMedia-iMT-101 into edossantos
began modulerizing
Merge pull request #17 from levfurtado/edossantos

Edossantos
Merge before iss#18
Merge branch 'master' of github.com:levfurtado/iMedia-iMT-101 into tp

Conflicts:
	index.html
Merge branch 'tp' of github.com:levfurtado/iMedia-iMT-101 into tp

Conflicts:
	index.html