updated .gitignore
Merge branch 'master' of https://github.com/dininski/Telerik-Academy
ready
Conflicts:
	.gitignore
conflict resolved