Made week selection more generic
Fixed multi-touch bug
Removed flash card prototypes
Merge branch 'master' of https://github.com/JGitHubApp/narsapp