Initial commit.
Better gitignore
Merge branch 'development'