Merge branches 'dev' and 'master' into dev
Merge branches 'dev' and 'master' into dev
Merge branches 'dev' and 'master' into dev
fixed error about type
minor changes to parseFlag
Merge branches 'master' and 'dev' into dev
Merge branches 'dev' and 'master' into dev
added checktype function
added binary to decimal conversion
overflow stuff
overflow function
Merge branches 'master' and 'dev'
Merge branches 'dev' and 'master' into dev
Error reporting fixed for the scanner
Merge branches 'master' and 'dev'