Sync repo for 04/09/14
Merge branch 'master' of https://github.com/GLolol/codescraps