Initial commit
latestcode
Feb11-Work
FEB13th-Code
Feb17thCode-Countrylist
FEB18TH-CODE
FEB19-CODE
FEB25th-CODE-SETTINGSPAGE
FEB26-CODE-SETTINGS-COMP
FEB28-thCODE
march11code
Merge https://github.com/deepaksood/BeatBucks

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/custom.css
	app/controllers/application_controller.rb
	app/controllers/home_controller.rb
	app/controllers/users_controller.rb
	app/models/user.rb
	app/views/beatpacks/_addnewtrack.html.erb
	app/views/devise/registrations/_edit.html.erb
	app/views/devise/registrations/edit.html.erb
	app/views/devise/registrations/edit.js.erb
	app/views/devise/registrations/new.html.erb
	app/views/home/_settings.html.erb
	app/views/home/settings.js.erb
	app/views/users/index.html.erb
	config/application.rb
	config/database.yml
	config/environments/development.rb
	config/routes.rb
	db/migrate/20140205100941_add_colums_to_users.rb
	db/schema.rb
	db/seeds.rb
march11code