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

Conflicts:
	Makefile
Merge branch 'master' of github.com:jeffschulte/protein
boxPlot before pulling from Rene
Merge with Rene
Merge with roundy
switched ADP and ATP in box_plots
updated box plot to have dividers at the endcaps
Added frequency_plot back (although didnt update it) and changed protein.cpp so prints out division of cell data for pill
Merge branch 'master' of github.com:jeffschulte/protein
debugging