commit 2014-11-21 00:43:10
Merge remote-tracking branch 'origin/master'
commit -a 2014-11-22 20:29:46
commit all 2014-11-24-20:17:21