Merge pull request #1 from DestroyerDiggin/master

cosmetic changes
added first draft of if else block for dojosailing
Merge pull request #2 from TheSplitMelon/master

added first draft of if else block for dojosailing