hello!
Merge https://github.com/smilinpiggy/smilinpiggy.github.com

Conflicts:
	README.md