added poltergeist
migrations
typeahead and mustache
routes for tracks inside mixtapes
track and mixtape model
adding poltergeist to the spec_helper
adding track to the mixtape on new
tracks controller for creating a new track
views for displaying the users mixtape and adding tracks
coffee for getting artist and song data from echo nest. view for adding new tracks
Fixed conflicts. Merge branch 'develop' into feature/tracks

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/mixtapes.js.coffee
	app/assets/javascripts/tracks.js.coffee
	app/assets/stylesheets/tracks.css.scss
	app/controllers/mixtapes_controller.rb
	app/controllers/tracks_controller.rb
	app/models/mixtape.rb
	app/models/track.rb
	app/views/mixtapes/index.html.erb
	app/views/mixtapes/new.html.erb
	config/routes.rb
	db/schema.rb
fixed migration conflicts
Removed unnecessary photo spec
Adding 'sign in with fb' to new mixtape view. Rendered in pop-up
Fixed redirect omniauth authentication to close pop-up
Connected mixtape_id to user at sign in
Fixed 'user can log in' test, (changing login route)
Adding Procfile and 'thin' to gemfile
Updated Procfile
Added Ruby version to Gemfile