Merge pull request #1 from shuyangli/dev

Dev
changed prompt
Merge branch 'master' of https://github.com/shuyangli/shuyangli.github.io

Conflicts:
	index.html
Merge branch 'master' into dev