trying some framework stuff
Merge branch 'master' of https://github.com/claireburghard/pd3-StudentOrganizer-Burghard-Gokhberg

Conflicts:
	.DS_Store