first commit
Merge branch 'master' of http://github.com/monsefoster/gdcujap

Conflicts:
	README.md