merging, &c.
Merge branch 'master' of github.com:121watts/retro into create-account
Added travis.yml to specify Ruby version
we can create a user with an encrypted password
Merge pull request #14 from 121watts/user-auth

User auth
Merge branch 'master' of github.com:121watts/retro
Merge pull request #15 from tyrbo/master

Added travis.yml
new user gets redirected to see all the retros
starting sessions branch
Moved CodeClimate stuff from rails helper to spec helper
Merge pull request #19 from tyrbo/master

Moved CodeClimate stuff from rails helper to spec helper
Add rudimentary authentication system
Add rudimentary authentication system
Merge branch 'sessions' of github.com:AndyDangerous/retro into sessions

Conflicts:
	spec/features/sign_in_spec.rb
Merge branch 'master' of github.com:121watts/retro into sessions
Remove unused method.
Merge pull request #26 from AndyDangerous/sessions

Sessions -- adds rudimentary auth system, creates new sessions, destroys sessions.
Merge pull request #30 from 121watts/sessions

Sessions -- basic session/auth system
fix merge conflicts between sessions (master) and front_end
Merge pull request #33 from AndyDangerous/master

merge some front end shit