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/helpers/track_helper.rb

@@ -0,0 +1,2 @@
+module TrackHelper
+end

rails/app/helpers/vkontakte.rb

@@ -0,0 +1,19 @@
+module Vkontakte
+  @@accounts = YAML.load_file("#{RAILS_ROOT}/config/vk_accounts.yml")
+  
+  def get artist, track, length
+    
+  end
+  
+  def getHtml q
+    
+  end
+  
+  def parseHtml html
+    
+  end
+  
+  def calcWeight files
+    
+  end
+end