asd

ASASDASD
Merge branch 'master' of https://github.com/OxfordCS2014BestestProject/InstantFeedback

Conflicts:
	Lectures+ Lecturer/res/layout/present.xml