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/views/artist/view.rhtml

@@ -8,7 +8,7 @@
 	<% @artist.albums.each do |album| %>
 		<% unless album.releases.empty? %>
 		<div class="album">
-			<div class="pic"></div>
+			<div class="pic"><img src="<%= album.cover(@artist.name) %>" width="250" height="250" alt=""/></div>
 			<h3 class="name"><%= album.name %> <%= (album.year ? album.year : '') %></h3>
 			<%
 				releases = album.releases
@@ -16,8 +16,8 @@
 			%>
 			<ul class="tracks">
 			<% first_release.tracks.each do |track|  %>
-				<li>
-					<span class="play"></span>
+				<li id="<%= track.id %>">
+					<span class="play<%= (track.inDb ? '' : ' disabled') %>"></span>
 					<span class="track-name"><%= track.name %></span>
 					<span class="duration"><%= track.length.toTime %></span>
 				</li>