PAIR PROGRAMMING! Pete and I worked on AJAX test.
Merge branch 'master' of https://github.com/mattvlr/Group-K-Calendar

Conflicts:
	main/calendar/ajaxtest.php