Commit from ryuzakim
Merge branch 'samplebranchg'
All files into github