First commit
Merge branch 'master' of https://github.com/generalchoa/generalchoa.github.io

Conflicts:
	README.md
fixed merge commit