Merge Test

Testing branch after merge.
Updating gitignore.
Merge pull request #3 from radam13/stev-dev

Pull .gitignore into master