Added admin page and stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestWebcamMVC/skills.html
	TestWebcamMVC/thankyou.html
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit dea5fb40118175f330c4340b60fab0b461db26c2.