Added Tokens
Extended token types available in tokenTypes.hpp
Added declaration for token class (token.hpp)
Merge branch 'master' into lexer

Merged to allow for updated makefile to prevent later complications
Added #pragmas
Implemented token class

Also fixed token.hpp
Merge branch 'lexer'

Branch merged to bring latest version on token into master