Testing 2-file student parsing
Merge branch 'WebAssign-Output' of https://github.com/scott-s-douglas/SWAPR into WebAssign-Output

Conflicts:
	sqlite1.py
Added Lab1 data, skipLinkless feature to webassignoutput
Merge branch 'WebAssign-Output' of https://github.com/scott-s-douglas/SWAPR into WebAssign-Output

Conflicts:
	SWAPRmoduletest.py
	sqlite1.pyc
	students.db