working on login/create user as popup
finished log in,create account
Merge branch 'fridaymo'

Conflicts:
	Gemfile
	app.rb
	app/models/user.rb
	db/migrate/20131108011336_create_users.rb
	db/migrate/20131108011501_create_drawings.rb
	db/schema.rb
	public/js/canvas.js
	views/index.erb