adding modal windows to articles
adding modal windows to photoStream_template.php, resolved conflicts went with martin's version of articleSTream.php
Merge branch 'master' of https://github.com/martianmartin/myStream