srb example nets
Merge branch 'master' of https://github.com/HFpostdoc/nmr
aaron test

aaron added a dummy line at the end of the outline
aaron test 2

my second test
Aaron test3

test for nick
aaron test of a branch

line added in branch
update
outline
update
nick learning git
outline with writing assignments
Merge branch 'master' into Aaron
Nicks file added
ben delete's nick's test file
ben's first stab
removed srb_example_nets.pptx
Merge branch 'ben' into beta
Merge branch 'master' into matt

Conflicts:
	docs/meeting/outline.txt