First Commit
Merge https://github.com/App6/VolunteerBeat

Conflicts:
	.gitignore