Initial commit
Merged changes
Updated gitignore