merge
use normalize function for solution, also swap some stuff around
accidentally replace a mistake
Merge branch 'new'

Conflicts:
	quikr.c