made small change to gitignore and labrpt

added .jpg to .gitignore. minor text change to labrpt.tex
synched remote/local .gitignore
fixed conflicts in local files