Basic Settings from the Ryan
Merge branch 'master' of github.com:chenlinwang/chenlinwang.github.com

Conflicts:
	index.html