put git ignore in there
merged master into vosters2 branch to get this development branch
fixing git ignore again
init. started working on error handling for signup/login
betsy saved me with git.  added error displaying for login and signup
added profile link to layout, ability for user to access profile from link
may edit user profile. validates updates. added user validations:password presence required. password confirmation must match password.
added delete user feature in profile with confirmation popup
Merge pull request #4 from zahidkarim/user_story

User story
Merge remote-tracking branch 'origin/development' into admin-second-half

Conflicts:
	.gitignore
	app/helpers/admins_helper.rb
	app/helpers/application_helper.rb
	log/development.log
	spec/controllers/admins_controller_spec.rb
	spec/models/admin_spec.rb
	tmp/pids/server.pid