Initial commit
initial commit
Merge branch 'gh-pages'

Conflicts:
	css/style.css
	images/logo.png
	index.html
homepage first iteration