bug fix
Merge branch 'master' of https://github.com/andrew-computerscience/iPad-YOU-Pad

Conflicts: