Initial Commit
Merge remote-tracking branch 'origin/master'

--Added .gitignore file from upstream