modified:   jasonparser.h
	modified:   main.cpp
Merge branch 'master' of https://github.com/hbirchtree/jason