slight elaboration on guidelines, added outline section (not written)
Merge remote-tracking branch 'upstream/master'
Merge pull request #15 from boylea/master

More detail to guidelines