create filter
modified filter and add validation
solve a conflict
errorメッセージが出るようにしました
追加できてる？？
solve merge
add error message
Merge branch 'master' into login
merge-charii
solve merge on Gemfile.lock
Merge pull request #12 from naitoumaia/login

Login
stash pop