some simple markdown with a link
Merge remote-tracking branch 'teacher/master' into sensr.net
Merge pull request #2 from adamb/sensr.net

some simple markdown with a link