simple typo fix
freudian typo strife vs. strive?

Was this intended, do you guys fight about using TDD? :)

[1] http://www.thefreedictionary.com/strife
[2] http://www.thefreedictionary.com/strive
fix years for GSOC
Merge pull request #1339 from esc/fix_typos

Fix typos in intro