Start Over
Merge branch 'master' of https://github.com/embarg0/Radio_Website

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/shows_controller.rb
	app/models/album.rb
	app/models/artist.rb
	app/models/band.rb
	app/models/host.rb
	app/models/play_sheet.rb
	app/models/show.rb
	app/models/song_inventory.rb
	app/models/track.rb
	app/views/guests/_form.html.erb
	app/views/guests/index.html.erb
	app/views/hosts/_form.html.erb
	app/views/hosts/index.html.erb
	app/views/play_sheets/_form.html.erb
	app/views/play_sheets/index.html.erb
	app/views/shows/index.html.erb
	app/views/song_inventories/index.html.erb
	config/routes.rb
	db/migrate/20140329220839_shows.rb
	db/migrate/20140329231454_hosts.rb
	db/migrate/20140329231511_song_inventories.rb
	db/migrate/20140329231601_guests.rb
	db/migrate/20140329231622_play_sheets.rb
	db/migrate/20140329231654_hosts_shows.rb
	db/migrate/20140330142115_tracks.rb
	db/migrate/20140330142306_albums.rb
	db/migrate/20140330142437_artists.rb
	db/schema.rb