more testing
Merge branch 'master' of http://github.com/MTM616/Lecturn

Conflicts:
	derp.php