add intro and outro working, but editing is now problematic
Merge pull request #13 from yairsz/YairsWorkBranch

Yairs work branch
Merge remote-tracking branch 'upstream/master'
Pulled from Yair master