merging jamie'search function
front page styling
Merge branch 'frontend'
Merge branch 'master' into testStart
new flashcard pops up