Octopress init
Merge branch 'master' of github.com:SongLee24/songlee24.github.com

Conflicts:
	index.html
Site updated at 2014-03-28 19:56:13 UTC