Update .gitignore and .sln file
Merge branch 'master' of https://github.com/hristofornikolov/JS2JafarTeamProject
Merge branch 'master' of https://github.com/hristofornikolov/JS2JafarTeamProject
Merge branch 'master' of github.com:hristofornikolov/JS2JafarTeamProject