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/test/fixtures/album_pics.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+# This model initially had no columns defined.  If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+#  column: value

rails/test/fixtures/track_data.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+# This model initially had no columns defined.  If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+#  column: value

rails/test/functional/track_controller_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class TrackControllerTest < ActionController::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end

rails/test/unit/album_pic_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class AlbumPicTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end

rails/test/unit/helpers/track_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class TrackHelperTest < ActionView::TestCase
+end

rails/test/unit/track_data_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class TrackDataTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end