Initial commit
initial work
stage2
Merge pull request #1 from igloosi/master

mergin new files