Implemented token class

Also fixed token.hpp