pulling to merge in master before starting work on flashcards app again
Merge branch 'master' of https://github.com/Thinkful/pysplash into content
implemented rob's style recommendations for flash-cards