commit before merge
Merge branch 'master' of http://github.com/yaukwankiu/armor
commit before merge
fixing conflicts