pulling master
getting up to date rep0
fixing merge conflicts
adding the ability to delete a deck
Merge branch 'master' of http://github.com/StyleASD/team_citadel

Conflicts:
	app/views/decks/show.blade.php
user can now delete a deck
Merge branch 'master' of http://github.com/StyleASD/team_citadel