model, psd
Merge branch 'master' of https://github.com/AbsentMoniker/YourStory into model

Conflicts:
	YourStory/app/assets/javascripts/application.js
	YourStory/app/controllers/application_controller.rb
	YourStory/app/controllers/sessions_controller.rb
	YourStory/app/controllers/users_controller.rb
	YourStory/app/helpers/sessions_helper.rb
	YourStory/app/models/user.rb
	YourStory/app/views/layouts/_header.html.erb
	YourStory/db/schema.rb
Merge branch 'master' of https://github.com/AbsentMoniker/YourStory into model

Conflicts:
	YourStory/app/assets/stylesheets/custom.css.scss
	YourStory/app/views/home/index.html.erb
	YourStory/app/views/layouts/application.html.erb
	YourStory/config/routes.rb
psd, model