gitignore changes
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	.gitignore
added logins controller test, users controller test, user model test
removed nav links from index and added them to application
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	app/views/layouts/application.html.erb
twitter omniauth login is partway there
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
Merge pull request #22 from Noahhh/master

Started mapping out note search page
users controller and .env pre merge
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	config/initializers/.env
	config/initializers/omniauth.rb
added logins/new.html.erb back after it inexplicably disappeared
modified .gitignore file with * before .env and .idea
Merge pull request #23 from gregburton/master

Added logins/new.html.erb back after it disappeared with a previous merge. Added some (currently non-functional) tests for logins controller, users controller, user model.
commit before merge
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru