Matt testing that git works
Merge branch 'master' of github.com:bohuie/jobcannon

Conflicts:
	README.md
	app/assets/images/king.jpeg
	app/assets/images/prof.jpeg
	app/assets/images/stickie-wide.png
	app/assets/javascripts/authentications.js.coffee
	app/assets/javascripts/bootstrap.js.coffee
	app/assets/javascripts/registrations.js.coffee
	app/assets/stylesheets/authentications.css.scss
	app/assets/stylesheets/bootstrap-responsive.css
	app/assets/stylesheets/bootstrap-responsive.min.css
	app/assets/stylesheets/bootstrap-theme.css
	app/assets/stylesheets/bootstrap-theme.min.css
	app/assets/stylesheets/bootstrap.css
	app/assets/stylesheets/bootstrap.min.css
	app/assets/stylesheets/bootstrap_and_overrides.css
	app/assets/stylesheets/registrations.css.scss
	app/assets/stylesheets/scaffolds.css.scss
	app/controllers/authentications_controller.rb
	app/controllers/experiences_controller.rb
	app/controllers/friendships_controller.rb
	app/controllers/links_controller.rb
	app/controllers/messages_controller.rb
	app/controllers/postings_controller.rb
	app/controllers/profile_controller.rb
	app/controllers/projects_controller.rb
	app/controllers/references_controller.rb
	app/controllers/registrations_controller.rb
	app/controllers/requirements_controller.rb
	app/controllers/search_controller.rb
	app/controllers/sessions_controller.rb
	app/controllers/skills_controller.rb
	app/controllers/surveys_controller.rb
	app/helpers/authentications_helper.rb
	app/helpers/registrations_helper.rb
	app/models/authentication.rb
	app/models/chatview.rb
	app/models/friendship.rb
	app/models/link.rb
	app/models/message.rb
	app/models/project.rb
	app/models/skilllabel.rb
	app/models/survey.rb
	app/views/authentications/_form.html.erb
	app/views/authentications/edit.html.erb
	app/views/authentications/index.html.erb
	app/views/authentications/index.json.jbuilder
	app/views/authentications/new.html.erb
	app/views/authentications/show.html.erb
	app/views/authentications/show.json.jbuilder
	app/views/devise/registrations/personal.html.erb
	app/views/experiences/details.html.erb
	app/views/experiences/edit.html.erb
	app/views/experiences/index.html.erb
	app/views/experiences/show.html.erb
	app/views/friendships/findfriend.html.erb
	app/views/friendships/index.html.erb
	app/views/layouts/_oldheader.html.erb
	app/views/links/edit.html.erb
	app/views/links/index.html.erb
	app/views/links/show.html.erb
	app/views/messages/_message.html.erb
	app/views/messages/create.js.erb
	app/views/messages/index.html.erb
	app/views/messages/privatechat.html.erb
	app/views/postings/edit.html.erb
	app/views/postings/index.html.erb
	app/views/postings/show.html.erb
	app/views/profile/index.html.erb
	app/views/profile/show.html.erb
	app/views/projects/edit.html.erb
	app/views/projects/index.html.erb
	app/views/projects/show.html.erb
	app/views/references/edit.html.erb
	app/views/references/index.html.erb
	app/views/references/one_ref.html.erb
	app/views/references/show.html.erb
	app/views/registrations/personal.html.erb
	app/views/requirements/edit.html.erb
	app/views/requirements/index.html.erb
	app/views/requirements/show.html.erb
	app/views/search/index.html.erb
	app/views/search/search.html.erb
	app/views/search/show.html.erb
	app/views/shared/_experiences.html.erb
	app/views/shared/_findfriend.html.erb
	app/views/shared/_friendrequests.html.erb
	app/views/shared/_friendsaccepted.html.erb
	app/views/shared/_friendsadded.html.erb
	app/views/shared/_friendslist.html.erb
	app/views/shared/_links.html.erb
	app/views/shared/_mini_requirements.html.erb
	app/views/shared/_newmessages.html.erb
	app/views/shared/_onlinefriends.html.erb
	app/views/shared/_postings.html.erb
	app/views/shared/_profileexperiences.html.erb
	app/views/shared/_profilefriends.html.erb
	app/views/shared/_profilelinks.html.erb
	app/views/shared/_profilepostings.html.erb
	app/views/shared/_profileprojects.html.erb
	app/views/shared/_profilereferences.html.erb
	app/views/shared/_profileskills.html.erb
	app/views/shared/_projects.html.erb
	app/views/shared/_references.html.erb
	app/views/shared/_requirements.html.erb
	app/views/shared/_results.html.erb
	app/views/shared/_skills.html.erb
	app/views/skills/edit.html.erb
	app/views/skills/index.html.erb
	app/views/skills/reccomend.html.erb
	app/views/skills/show.html.erb
	app/views/surveys/create.html.erb
	app/views/surveys/index.html.erb
	app/views/surveys/show.html.erb
	config/initializers/faye_token.rb
	config/initializers/omniauth.rb
	config/locales/en.bootstrap.yml
	db/migrate/20131125022356_create_authentications.rb
	db/migrate/20140220233716_devise_add_lastseenable_test.rb
	db/migrate/CreateSurvey.rb
	faye.ru
	public/assets/application-13e9c547f27dfc655dd180b904a2053b.js
	public/assets/application-13e9c547f27dfc655dd180b904a2053b.js.gz
	public/assets/application-14393357b01d50b22ea908cba67e078f.css
	public/assets/application-14393357b01d50b22ea908cba67e078f.css.gz
	public/assets/application-32e6846399de9bae689c5b1cb42498d5.css
	public/assets/application-32e6846399de9bae689c5b1cb42498d5.css.gz
	public/assets/application-51c9084ad28ad8b42ff0ddfeedafb186.css
	public/assets/application-51c9084ad28ad8b42ff0ddfeedafb186.css.gz
	public/assets/application-8118713ed84bad5d13d70ab2a7b133f7.js
	public/assets/application-8118713ed84bad5d13d70ab2a7b133f7.js.gz
	public/assets/application-e05e40abc0154f9acf7045bf496f581d.js
	public/assets/application-e05e40abc0154f9acf7045bf496f581d.js.gz
	public/assets/glyphicons-halflings-c806376f05e4ccabe2c5315a8e95667c.png
	public/assets/glyphicons-halflings-white-62b67d9edee3db90d18833087f848d6e.png
	public/assets/king-67e2c3a9e3ac1232583d249965557989.jpeg
	public/assets/manifest-5d927c77ffb3477865a0311824e76dbc.json
	public/assets/prof-c0da3650410d93fa91e5a0871757339d.jpeg
	public/assets/stickie-wide-111332cff541c2dec1606edb2fa31535.png
	public/assets/twitter/bootstrap/glyphicons-halflings-c806376f05e4ccabe2c5315a8e95667c.png
	public/assets/twitter/bootstrap/glyphicons-halflings-white-62b67d9edee3db90d18833087f848d6e.png
	public/javascripts/autocomplete-rails.js
	spec/controllers/experiences_controller_spec.rb
	spec/controllers/friendships_controller_spec.rb
	spec/controllers/links_controller_spec.rb
	spec/controllers/postings_controller_spec.rb
	spec/controllers/projects_controller_spec.rb
	spec/controllers/references_controller_spec.rb
	spec/controllers/registrations_controller_spec.rb
	spec/controllers/requirement_controller_spec.rb
	spec/controllers/search_controller_spec.rb
	spec/controllers/skill_controller_spec.rb
	spec/controllers/survey_controller_spec.rb
	spec/factories/friendships.rb
	spec/factories/links.rb
	spec/factories/projects.rb
	spec/factories/skilllabels.rb
	spec/factories/survey.rb
	spec/models/friendship_spec.rb
	spec/models/link_spec.rb
	spec/models/project_spec.rb
	spec/models/skilllabel_spec.rb
	spec/models/survey_spec.rb
	spec/requests/static_pages_spec.rb
	spec/support/devise.rb
	spec/support/request_helpers.rb
	spec/support/utilities.rb
	spec/views/add_reference_spec.rb
	spec/views/add_skill_spec.rb
	spec/views/edit_registration_spec.rb
	spec/views/experiences_spec.rb
	spec/views/new_registration_spec.rb
	spec/views/postings_spec.rb
	spec/views/profile_spec.rb
	spec/views/projects_edit_spec.rb
	spec/views/references_spec.rb
	spec/views/search_spec.rb
	spec/views/sign_in_spec.rb