folder
jr
rollback
Merge branch 'master' of gh:igoyak/igoyak.github.io

Conflicts:
	index.html
Merge branch 'master' into jr2