change types from strings to tokens
add type to imports
Merge pull request #24 from quarklang/types

change types from strings to tokens