Merge pull request #1 from stulees/master

Infrastructure and initial base files