Initial commit
Added gitignore
Merge with master