Added if-then-else to the language
Merge branch 'master' of github.com:Jegp/BPRD2013