initial commit
Merge branch 'master' of http://github.com/edgd1er/M1S1_INFO