seed attempt
seed final
Before pull.
indents fixxxxxxed
Merge pull request #3 from PLopezD/seed_team

Seed team
Merge branch 'master' of https://github.com/unknownbreaker/bachelor.ette

Conflicts:
	db/migrate/20141010122609_create_users.rb
Ready for thread.
Merge pull request #4 from tsabend/master

Fixed password_hash naming
completed successful sign up, log in, viewing of profile; need to allow editing of profile without editing password; bachelorette can view all proposals; no user can make more than one proposal to the bachelorette;
view proposer's profile
Refactored views with partials. Added helper methods for has_already_proposed? and the_bachelorette?
Fixed the queue.
Ready for styling. Need to fix edit page. Need to add notifications.
Merge pull request #5 from tsabend/master

Ready for styling.
nav
nav
add gitignore file
Merge branch 'navbar'
attempt3