initial commit
commit images
Merge branch 'master' of github.com:ribacop/blog

Conflicts:
	index.html
	login.html
	style.css
Merge branch 'master' of github.com:ribacop/blog

Conflicts:
	index.html
	login.html
	style.css