modified:   .idea/workspace.xml
Merge branch 'master' of https://github.com/AlexanderCl/beatfuel

Conflicts:
	.idea/workspace.xml

	modified:   .idea/workspace.xml
	modified:   app/assets/javascripts/application.js
	new file:   app/assets/javascripts/audio.min.js
	new file:   app/assets/javascripts/bootstrap.min.js
	new file:   app/assets/javascripts/countries.js
	modified:   app/assets/javascripts/facebook.js.coffee
	deleted:    app/assets/javascripts/pages.js.coffee
	new file:   app/assets/javascripts/playlist.js
	new file:   app/assets/javascripts/quotes.js
	modified:   app/assets/stylesheets/application.css
	new file:   app/assets/stylesheets/audio_playlist.css
	modified:   app/assets/stylesheets/core.css
	new file:   app/controllers/recommendations_controller.rb
	modified:   app/controllers/users_controller.rb
	modified:   app/helpers/application_helper.rb
	modified:   app/helpers/pages_helper.rb
	modified:   app/helpers/users_helper.rb
	new file:   app/models/mixtape.rb
	new file:   app/models/recommendation.rb
	modified:   app/models/user.rb
	modified:   app/views/pages/home.html.erb
	modified:   app/views/shared/_nav.html.erb
	modified:   app/views/users/edit.html.erb
	modified:   app/views/users/index.html.erb
	modified:   app/views/users/show.html.erb
	modified:   config/initializers/omniauth.rb
	modified:   config/routes.rb
	new file:   db/migrate/20131223140308_add_user_id_to_mixtapes.rb
	new file:   db/migrate/20131223140534_create_recommendations.rb
	new file:   db/migrate/20131223150606_add_location_to_user.rb
	modified:   db/schema.rb
	new file:   test/fixtures/mixtapes.yml
	new file:   test/models/mixtape_test.rb