Fixed problems with declarations (and other issues with parser)
Merge branch 'master' of https://github.com/ChrisFugl/G-project