Resolved conflicts
Fixed syntax errors, it works now
Merge branch 'master' of https://github.com/aliciacatalina/pyngo

Conflicts:
	parser.out
	parsetab.py
	parsetab.pyc
	syntax.py
	syntax.pyc