init

init
Merge pull request #1 from mwolski89/dev

init