Added pagination and article show action
Added tests for show action and pagination
Styled current page nav number
Took out negative
Merge pull request #20 from andycandrea/article-organization

Article organization
Refactored
Added controller method tests
Renamed DB column
Replaced dynamic finder
Removed comments
Merge pull request #22 from andycandrea/user-authentication

User Auth 2: Electric Boogaloo
Added password reset and user editing
added test
Added mailer test
Added new test
Added additional test
Cleaned up code
Refactor password reset and remember tokens

- Rebased from updated master

- Password reset and remember tokens now combined into token.rb
Merge local and remote password-reset branches

- Merge branch 'password-reset' of https://github.com/andycandrea/hnews into password-reset

Conflicts:
	.gitignore
	app/controllers/application_controller.rb
	app/models/user.rb
	config/routes.rb
	db/schema.rb
	spec/models/session_spec.rb