Added support for json
Updated rails and added rvmrc file
Optimized songs query to include artists
Removed coffee script
Removed unused file
Update README.md
Added unicorn, capistrano and switched to db to postgre
Layout refactoring
White space refactoring
Merge branch 'master' into ember_conversion

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/home.js
	app/controllers/artists_controller.rb
	app/controllers/songs_controller.rb
	app/models/song.rb
	app/views/home/index.html.erb
	app/views/layouts/application.html.erb
Fix issues with bootstrap
Merge branch 'master' into ember_conversion

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/views/layouts/application.html.erb