need to pull
fixed gemfile.lock merge conflict
first step of twitter login works
fixed initializers directory merge conflict
moved ..env
fixed merge conflict
user is now saved to database when logging in with twitter
login step 1 and step 2 work now
registration process is complete
created index logic (logged in or not), added current_user/logged_in? helper methods
added logout option
Merge pull request #3 from kamilahjae/CalendarGem

Calendar gem
fixed session_c merge conflict
fixed merge conflicts
Merge pull request #4 from kamilahjae/twitter

Twitter login/logout
delete .env
made user form a partial, added log in/log out flash messages
added tool model and tools controller
Merge pull request #5 from kamilahjae/form

made user form a partial, added log in/log out flash messages
Merge branch 'master' into CalendarGem