Trying to display modal but still not working
Merge branch 'dev' into modals
Merge branch 'dev' into modals

Conflicts:
	public/scripts/controllers/queue.js
Merge pull request #83 from deini/dev

Major Improvements to Player and Search
Option to tweet the link.
fixed bug in scripts
Merge branch 'modals' into dev

Conflicts:
	public/scripts/controllers/queue.js
Merge pull request #85 from alexmckenley/dev

fixed bug in scripts
Not making new instance of controller when routing in order to show response modal
Merge pull request #86 from malucky/dev

Fixed problem with rerouting and modal
Refactored response modal logic into frame controller
Changed way to clear search results. Took out share buttons in share.html
Merge pull request #87 from malucky/dev

Fixed modal problem.
Reordered the main.css link, added initial 2 column view to index
Fixed bug with modal link
Using $location.host() instead of hard coding localhost
Merge pull request #88 from malucky/dev

Using $location.host() instead of hard coding localhost
initial 2 column redesign
Merge branch '2col' into dev
Merge pull request #89 from nickescallon/dev

Initial 2 column redesign