New parser
fix conflicts .-.

Conflicts:
	index.html