new user stuff
altered column type from int to bigint to accomdoate phone_num field
added gravatar-ultimate into gemfiles, bundled
created home page with basic register form
added twitter, website, mentor attributes to User table
Merge branch 'master' of github.com:johnathon101/project-workhang

Conflicts:
	db/schema.rb
Added :through models
Merge branch 'master' of github.com:johnathon101/project-workhang
directed root to pages#home
Groups index working, needs checked_in and moderator functionality
registration redirects to user's profile
Starting on logins, will switch branch accordingly
Merge branch 'master' into groups_through

Conflicts:
	config/routes.rb
	db/schema.rb
update profile attributes working well and routed
full name method helper working
fixed full_name method
Log in, log out working
Merge branch 'master' of github.com:johnathon101/project-workhang

Conflicts:
	app/models/user.rb
Merge branch 'master' into logins
Merge branch 'master' into googapi2

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