Merge pull request #1 from EthanBlackburn/edit

trying to update pmarti28/queue/master with EthanBlackburn/Queue edit
added popup window in queueTableViewController
dumb commit
Merge pull request #2 from pmarti28/popupwindow

Popupwindow
Merge pull request #1 from pmarti28/master

preliminary popup Window Added and working
Merge branch 'master' into edit

Conflicts:
	Queue/Main.storyboard
	Queue/QueueTableViewController.m