changed About Me

changed About Me
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/about.html