another
Merge branch 'master' of https://github.com/tiagoramos92/githubExample

* 'master' of https://github.com/tiagoramos92/githubExample:
  Update about.html
  Update about.html

Conflicts:
	about.html