Changed the guidelines for 'and' and 'or' keywords
Merge pull request #1 from OwnLocal/or_keyword

Allow 'or' and 'and' keywords for flow control