initial commit
Merge branch 'master' of github.com:gpestana/aaltoSchedule

Conflicts:
	.gitignore