udpate
Merge branch 'master' of /home/jeffschulte/protein
Merge /home/jeffschulte/protein

Conflicts:
	Makefile
test
Merge branch 'master' of github.com:jeffschulte/protein
fixed typo bug
legends box moved
boxPlot before pulling from Rene
Merge with Rene
Merge with roundy
switched ADP and ATP in box_plots