Primer commit
Merge https://github.com/tulcas/codecademy