minor changes
Merge branch 'latest' of https://github.com/andrew-computerscience/iPad-YOU-Pad into latest

Conflicts:
	.DS_Store
.