merge
merge conflicT
commit all
functional CAS login
push
fixed logout button issue
user.rb
migration not woring
forgot to commit app controller