committing changes from last week, i think
Merge branch 'master' of https://github.com/Buccoli15/Dekaaz

Conflicts:
	.DS_Store