added a lot of stuff after coming back before pulling Renes changes.  Nothing very major except the bug fix in protein_microscopy
merged with Rene after coming back from trip
took figures from paper
Merge branch 'master' of https://github.com/renezeto/protein
changed Makefile
test