Merge branches 'devAST' and 'master' into devAST
Merge branch 'devAST' of https://github.com/Torwegia/cs660 into devAST
strong types added