Initial commit
Merge branch 'master' of github.com:davidtingsu/calbeat into skeleton_code

Conflicts:
	.gitignore