Demo stuff.
Merge branch 'master' of https://github.com/rhuang/semantix

Conflicts:
	app/parser.py