getting ready for merge
Merge branch 'parser' of https://github.com/havellay/CSE5243 into parser

Conflicts:
	vector/parser.py