Merge branch 'development' of github.com:trinityXmontoya/project_2 into user_profiles

Conflicts:
	app/models/user.rb
	config/routes.rb
Merge branch 'development' of github.com:trinityXmontoya/project_2 into user_profiles

Conflicts:
	app/models/user.rb
	config/routes.rb
Merge branch 'development' of github.com:trinityXmontoya/project_2 into user_profiles
User_profile_view
Create things_to_do

THINGS TO DO!!!
Update things_to_do
Update things_to_do
Update things_to_do
Update things_to_do

Updated w/comments. PLEASE READ!
Merge pull request #14 from trinityXmontoya/user_profiles

User profiles
merging in clean copy
facebook user sign out and sign in working
too many views keep blowing up at me