c
Merge branch 'master' of github.com:ivancho98/HSS

Conflicts:
	SHSLatex/abstract.log
merge
gitignore
Merge branch 'master' of github.com:ivancho98/HSS

Conflicts:
	SHSLatex/SHSproject.log
	SHSLatex/SHSproject.pdf
	SHSLatex/SHSproject.synctex.gz
	SHSLatex/abstract.log