ex2.1-3 Oct 11
Merge branch 'master' of https://github.com/XiXiLocked/XiXiLocked.github.io

Conflicts:
	_posts/2014-10-11-gtm101_15.html