Add start for q2
Finish q1
Merge branch 'alex'

Conflicts:
	main.tex