First commit
Updated gitignore
Initial merge