Added logic for main menu screen
Merge branch 'develop' of https://github.com/hitchcott/TAPcards into develop
Tweaked some routes

Merge commit '0c052b6d115542fec2b48411a9e1f0acf29fa3c2' into flashcards_generation

Conflicts:
	lib/routes.coffee