logo
Merge branch 'gh-pages' of https://github.com/ebkane/project_2 into gh-pages

Conflicts:
	about.html