Initial commit.
Merge branch 'master' of https://github.com/jocamar/jocamar.github.io

Conflicts:
	README.md
stuff