Merge /home/zetor/protein
Merge /home/jeffschulte/protein
Merge /home/zetor/protein
Merge /home/jeffschulte/protein
Merge /home/zetor/protein
Merge /home/jeffschulte/protein
Merge /home/zetor/protein
Merge /home/zetor/protein
Merge /home/zetor/protein
density movie update
test
density movie
fixed bug
.
batch bug
fixed typo thanks to JEFF!
fixed typo
Merge branch 'master' of /home/zetor/git/protein
merge
.
Merge branch 'master' of /home/zetor/git/protein
merge