d
d
Merge https://github.com/btpka3/btpka3.github.com

Conflicts:
	.gitignore
d