Initial commit
Initial commit
Merge branch 'master' of github.com:LehmRob/gcal

Conflicts:
	.gitignore