update intro and wallets info
Merge remote-tracking branch 'kbouw/master'
resolve conflicts
Merge pull request #7 from mkeung/master

content - intro and wallets