Merge branch 'master' of github.com:magnolia-fan/BeatHaven

Conflicts:
	rails/app/views/artist/view.rhtml
	rails/config/routes.rb
	rails/public/stylesheets/beathaven.css

rails/app/controllers/artist_controller.rb

@@ -2,7 +2,12 @@
 class ArtistController < ApplicationController
   require 'open-uri'
 	def view
-	  @artist = Artist.getByName(params[:name].gsub('+', ' ').gsub('%20', ' '))
+		if params[:name].nil?
+	  		name = ''
+	  	else
+	  		name = params[:name].gsub('+', ' ').gsub('%20', ' ')
+	  	end
+	  	@artist = Artist.getByName(name)
 	end
 end
 

rails/app/controllers/track_controller.rb

@@ -0,0 +1,13 @@
+class TrackController < ApplicationController
+  require 'net/http'
+  require 'uri'
+  def listen
+    render :json => YAML.load_file("#{RAILS_ROOT}/config/vk_accounts.yml")
+  end
+  
+  private
+  
+  def fetchSearch q
+    
+  end
+end