Merge branch 'dev' into feature/Roderick-Student-UI
Fixed the buttons for small screen devices when inside a deck
merged dev into branch and resolved conflicts in styles.css and deck_view.html
Merge pull request #32 from Harvard-ATG/feature/Roderick-Student-UI

Feature/roderick student ui