Initial commit
merged initial copy
added ignore file and updated ini version numbers
Merge pull request #1 from switchspan/master

merge of dev and master