Merge branches 'master' and 'devAST'
Merge branches 'master' and 'devAST'
removed one of the files
Merge branches 'devAST' and 'master' into devAST
Merge branch 'devAST' of https://github.com/Torwegia/cs660 into devAST
code needs to be fixed