Completed deck page
Merge branch 'master' of https://github.com/StyleASD/team_citadel into updating_deck_layout