add login controller and login/signup view
add login controller and login/signup view
Merge branch 'jeremy-alberto' of github.com:velveetachef/Chirper into jeremy-alberto

Conflicts:
	app/controllers/login_controller.rb
	app/models/user.rb
	app/views/login.erb
Merge pull request #1 from velveetachef/chris-john

confirmed!
Merge pull request #3 from velveetachef/chris-john

index.erb updates
resolve merge conflicts both branches to master
update login route
add password encryption
added chirp
Merge pull request #4 from velveetachef/alberto

added chirp
Merge pull request #5 from velveetachef/chris-john

css complete
merge project