merge conflict resolved within ticket model
further merge conflict resolved with ticket
further bug fixes for seed file and models for association testing
Merge pull request #13 from bumblebees-2014/controller_logic

debug seed file according to professional/ticket updates in migration
Add new and destroy for session controller
-users can login
-user nav display changes given signed in/out
-add sign in form
-add sign out button
resolved merge conflicts in user model

Merge remote-tracking branch 'origin/master' into user_login

Conflicts:
	app/models/user.rb
Merge pull request #14 from bumblebees-2014/user_login

User login
fixed merge conflicts to obtain user login functinality
fixed view issues in the nav bar regarding logged in/logged out