Merge remote-tracking branch 'kbouw/master'
update bottom shortcut links, faucet content
Merge remote-tracking branch 'kbouw/master'
Merge pull request #10 from mkeung/master

update bottom shortcuts, faucet content