first commit
add gemfile.lock
update gemfile
update css
update users
update users
update users
update users for new route
update users controller
add new files
soundcloud integration
Merge branch 'master' of heroku.com:likega

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/users_controller.rb
	app/models/user.rb
	app/views/users/_fields.html.erb
	app/views/users/_show_fields.html.erb
	config/routes.rb
	db/schema.rb
removed part of the merge diff that i accidentally left
forgot to merge user.rb
changed soundcloud redirect uri from localhost to heroku
made tokens indefinite, fixed signup path, and fixed blank password bug
user can only see his profile