updated git ignore
updated git ignore
fixed merge conflicts
Merge pull request #3 from alexcodreanu86/development

Development