Initial commit
Merge origin/master
Solved conflicts on .gitignore
Updated .gitignore
Initial commit