Merge branch 'eliutt-branch'
too drunk to understand this commit
fixed my accidental modifications
edited gitignore
Merge branch 'master' into eliutt-branch