scanner done
Merge branches 'dev' and 'master' into dev
Merge branches 'dev' and 'master' into dev

Conflicts:
	PA5/test.c
added extra testcases
Merge branches 'master' and 'dev'