Updated for testing
Tests for events and reminders
fixed merge conflict
Added tests for incomplete, edit, and delete events
Updated different event test for sporting event
Add change event type test
updated test environment
Merge branch 'master' into unit_testing

Conflicts:
	index.html
Updated testing framework
Merge pull request #37 from wesleyk/unit_testing

Unit testing