2014-08-12 checkin
Merge branch 'master' of github.com:tuestudy/tuestudy.github.io