salam
Merge branch 'master' of https://github.com/minmit/BS-Thesis

Conflicts:
	.gitignore
5